diff --git a/file.changes b/file.changes index eb9bb38..7a9fb22 100644 --- a/file.changes +++ b/file.changes @@ -1,8 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 21 17:09:56 UTC 2022 - Dominique Leuenberger + +- Drop pkgconfig(libseccomp) BuildRequires and stop injecting + libseccomp cflags into CFLAGS: libseccomp has been disabled for a + long time already. +- Move the special 'check' part from install to %check. + ------------------------------------------------------------------- Thu Oct 21 06:24:35 UTC 2021 - Dr. Werner Fink - Remove file-5.38-allow-readlinkat.dif as already doen in latest - file 5.41 + file 5.41 ------------------------------------------------------------------- Tue Oct 19 09:52:12 UTC 2021 - Dr. Werner Fink diff --git a/file.spec b/file.spec index d6dac6c..414d304 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,6 @@ BuildRequires: libtool BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(libseccomp) URL: http://www.darwinsys.com/file/ # bug437293 %ifarch ppc64 @@ -136,7 +135,7 @@ export LC_ALL=POSIX rm -f Magdir/*,v Magdir/*~ rm -f ltcf-c.sh ltconfig ltmain.sh autoreconf -fiv -export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)" +export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config)" %configure --disable-silent-rules --datadir=%{_miscdir} \ --disable-static \ --disable-libseccomp \ @@ -155,7 +154,9 @@ echo '# global magic file is %{_miscdir}/magic(.mgc)' >> %{buildroot}%{_sysc %if %{with decore} install -s dcore %{buildroot}%{_bindir} %endif +rm -f %{buildroot}%{_libdir}/*.la +%check # Check out that the binary does not bail out: LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH @@ -166,7 +167,6 @@ for dir in %{_bindir} /%{_lib} %{_libdir} ; do xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic done unset LD_LIBRARY_PATH -rm -f %{buildroot}%{_libdir}/*.la %post -n %libname -p /sbin/ldconfig diff --git a/python-magic.spec b/python-magic.spec index d4e8f26..50d5b29 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed