diff --git a/0001-file-localmagic.patch b/0001-file-localmagic.patch index 4440758bb48af9638f5898eeca1e6cb53b65f8bb..f7d253bf49dc56f4138183155bd6eb1fc52d6a8c 100644 --- a/0001-file-localmagic.patch +++ b/0001-file-localmagic.patch @@ -36,13 +36,13 @@ diff --git a/src/apprentice.c b/src/apprentice.c index db21787..5134682 100644 --- a/src/apprentice.c +++ b/src/apprentice.c -@@ -496,7 +496,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) +@@ -495,7 +495,7 @@ #ifndef COMPILE_ONLY map = apprentice_map(ms, fn); if (map == NULL) { - if (ms->flags & MAGIC_CHECK) + if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0) - file_magwarn(NULL, "using regular magic file `%s'", fn); + file_magwarn(ms, "using regular magic file `%s'", fn); map = apprentice_load(ms, fn, action); if (map == NULL) -- diff --git a/file-5.45.tar.gz b/file-5.45.tar.gz deleted file mode 100644 index 6c680b5ad31c5d860cb81fdc8ff83cf8322c3757..0000000000000000000000000000000000000000 Binary files a/file-5.45.tar.gz and /dev/null differ diff --git a/file-5.46.tar.gz b/file-5.46.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9ec26d32438b115f911aa0c1e9a49d62359403b6 Binary files /dev/null and b/file-5.46.tar.gz differ diff --git a/file.spec b/file.spec index 36af639cdb22fa0f660e7f205512589726e81b19..fccffe062aca85dde9f78818fb91e0e96c198db8 100644 --- a/file.spec +++ b/file.spec @@ -1,10 +1,10 @@ Name: file -Version: 5.45 -Release: 3 +Version: 5.46 +Release: 1 Summary: A tool to identify the type of a particular file type -License: BSD -URL: http://www.darwinsys.com/file/ -Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz +License: BSD-2-Clause +URL: https://www.darwinsys.com/file/ +Source0: http://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz Patch1: 0001-file-localmagic.patch @@ -81,7 +81,7 @@ mkdir -p .%{_bindir} .%{_sysconfdir} .%{_mandir}/man1 .%{_mandir}/man5 .%{_datad cd - %make_install -rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la +%delete_la mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} cp -dR ./magic/magic.local ${RPM_BUILD_ROOT}%{_sysconfdir}/magic cat magic/Magdir/* > ${RPM_BUILD_ROOT}%{_datadir}/misc/magic @@ -92,8 +92,6 @@ cd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT} %{__install} -d ${RPM_BUILD_ROOT}%{_datadir}/%{name} -%ldconfig_scriptlets libs - %check export LD_LIBRARY_PATH=$PWD/src/.libs make -C tests check @@ -123,13 +121,15 @@ make -C tests check %files -n python3-file-magic %doc python/README.md python/example.py -%{!?_licensedir:%global license %%doc} %license COPYING %{python3_sitelib}/magic.py %{python3_sitelib}/*egg-info %{python3_sitelib}/__pycache__/* %changelog +* Sun Dec 14 2025 Funda Wang - 5.46-1 +- update to version 5.46 + * Fri Dec 12 2025 wangmian - 5.45-3 - use python3-file-magic instead of python3-maigc diff --git a/file.yaml b/file.yaml index 1f20003d4c82610cf9b561bc1ffb3358956e8900..79a61e3f826aa0db4098fb183f95f22917de5385 100644 --- a/file.yaml +++ b/file.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: file/file -tag_prefix: FILE -seperator: "_" +tag_prefix: ^FILE +separator: "_"