1 changed files with 81 additions and 61 deletions
--- a/SPECS/libseccomp.spec
+++ b/SPECS/libseccomp.spec
@ -1,29 +1,24 @@
-%bcond_without check
+Name:           libseccomp
+Version:        2.5.2
+Release:        2%{?dist}
+Summary:        Enhanced seccomp library
+License:        LGPLv2
+URL:            https://github.com/seccomp/libseccomp
+Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz

-Summary: Enhanced seccomp library
-Name: libseccomp
-Version: 2.5.2
-Release: 1%{?dist}
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
-License: LGPLv2
-Group: System Environment/Libraries
-Source: https://github.com/seccomp/libseccomp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-URL: https://github.com/seccomp/libseccomp
+# Backports from upstream

 ## From: https://github.com/seccomp/libseccomp/commit/5532444587fa5f33a43179ca5cc710f1bb05f51f
-Patch0101:     0101-fix-11-basic-basic_errors-on-old-kernels.patch
+Patch0101:      0101-fix-11-basic-basic_errors-on-old-kernels.patch

-Buildrequires: gperf
-%ifarch %{valgrind_arches}
+BuildRequires:  gcc
+BuildRequires:  gperf
+BuildRequires:  make
+
+%ifnarch riscv64 s390
 # Versions prior to 3.13.0-4 do not work on ARM with newer glibc 2.25.0-6
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1466017
-BuildRequires: valgrind >= 1:3.13.0-4
-%endif
-# Upstream tests are not suited to some architectures
-%ifarch s390 || s390x || ppc64le
-%global good_arch 0
-%else
-%global good_arch 1
+BuildRequires:  valgrind >= 1:3.13.0-4
 %endif

 %description
@ -34,9 +29,8 @@ application is allowed to execute, all of which are enforced by the Linux
 Kernel.

 %package devel
-Summary: Development files used to build applications with libseccomp support
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release} pkgconfig
+Summary:        Development files used to build applications with libseccomp support
+Requires:       %{name}%{?_isa} = %{version}-%{release}

 %description devel
 The libseccomp library provides an easy to use interface to the Linux Kernel's
@ -46,9 +40,8 @@ application is allowed to execute, all of which are enforced by the Linux
 Kernel.

 %package static
-Summary: Enhanced seccomp static library
-Group: Development/Libraries
-Requires: %{name}-devel%{?_isa} = %{version}-%{release} pkgconfig
+Summary:        Enhanced seccomp static library
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}

 %description static
 The libseccomp library provides an easy to use interface to the Linux Kernel's
@ -58,37 +51,33 @@ application is allowed to execute, all of which are enforced by the Linux
 Kernel.

 %prep
-%setup -q
-
-%patch0101 -p1
+%autosetup -p1

 %build
 %configure
-make V=1 %{?_smp_mflags}
+%make_build

 %install
-rm -rf "%{buildroot}"
-mkdir -p "%{buildroot}/%{_libdir}"
-mkdir -p "%{buildroot}/%{_includedir}"
-mkdir -p "%{buildroot}/%{_mandir}"
-make V=1 DESTDIR="%{buildroot}" install
-rm -f "%{buildroot}/%{_libdir}/libseccomp.la"
+mkdir -p %{buildroot}/%{_libdir}
+mkdir -p %{buildroot}/%{_includedir}
+mkdir -p %{buildroot}/%{_mandir}
+
+%make_install
+
+rm -f %{buildroot}/%{_libdir}/libseccomp.la

-%if %{with check} && %{good_arch}
 %check
-make V=1 check
+# Tests 36 and 37 fail on the build systems for the arches below and I'm not
+# able to reproduce the failure so just skip the tests for now
+%ifarch i686 ppc64le s390x
+rm -f tests/36-sim-ipc_syscalls.tests tests/37-sim-ipc_syscalls_be.tests
 %endif
+%make_build check

-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig

 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc CREDITS
-%doc README.md
-%doc CHANGELOG
+%doc CREDITS README.md CHANGELOG CONTRIBUTING.md
 %{_libdir}/libseccomp.so.*

 %files devel
@ -104,27 +93,59 @@ make V=1 check
 %{_libdir}/libseccomp.a

 %changelog
-* Fri Nov 05 2021 Zoltan Fridrich <zfridric@redhat.com> - 2.5.2-1
+* Fri Nov 05 2021 Zoltan Fridrich <zfridric@redhat.com> - 2.5.2-2
+- fix devel-usability test
 - rebase to 2.5.2
-  resolves: rhbz#2019893
+  resolves: rhbz#2019887

-* Thu Feb 18 2021 Radovan Sroka <rsroka@redhat.com> - 2.5.1-1
- rebase to 2.5.1
-  resolves: rhbz#1927635
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.0-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Tue Apr 21 2020 Jiri Vymazal <jvymazal@redhat.com> - 2.4.3-1
- rebase to upstream version 2.4.3 
-  resolves: rhbz#1770693
-  resolves: rhbz#1768583
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5.0-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* Fri May 31 2019 Marek Tamaskovic <mtamasko@redhat.com> - 2.4.1-1
- rebase to 2.4.1
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-* Fri May 10 2019 Daniel Kopecek <dkopecek@redhat.com> - 2.3.3-4
- spec: make the check phase conditional
+* Wed Aug 05 2020 Neal Gompa <ngompa13@gmail.com> - 2.5.0-3
+- Apply fixes to change internal handling of the notification fd (#1865802)

-* Fri Aug  3 2018 Florian Weimer <fweimer@redhat.com> - 2.3.3-3
- Honor %%{valgrind_arches}
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 24 2020 Neal Gompa <ngompa13@gmail.com> - 2.5.0-1
+- New upstream version (#1858965)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 16 2019 Neal Gompa <ngompa13@gmail.com> - 2.4.2-2
+- Modernize spec
+- Backport fix for missing __SNR_ppoll symbol (#1777889)
+- Refresh patch to build on aarch64 with upstream version
+
+* Wed Nov 20 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.2-1
+- New upstream version (#1765314)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Apr 17 2019 Paul Moore <paul@paul-moore.com> - 2.4.1-0
+- New upstream version
+
+* Thu Mar 14 2019 Paul Moore <paul@paul-moore.com> - 2.4.0-0
+- New upstream version
+- Added a hack to workaround test failures (see %check above)
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 07 2018 Paul Moore <paul@paul-moore.com> - 2.3.3-4
+- Remove ldconfig scriptlet, thanks to James Antill (RHBZ #1644074)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -228,4 +249,3 @@ make V=1 check

 * Tue Jun 12 2012 Paul Moore <pmoore@redhat.com> - 0.1.0-0
 - Initial version
-