From 1b31ba421bbb3cdbe6ee89662864650929ca3423 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 15 Feb 2016 22:57:03 +0200 Subject: [PATCH] up to 2.2.3 --- libseccomp-pc.patch | 12 ------------ libseccomp.spec | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 libseccomp-pc.patch diff --git a/libseccomp-pc.patch b/libseccomp-pc.patch deleted file mode 100644 index 68498af..0000000 --- a/libseccomp-pc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libseccomp-2.0.0/Makefile~ 2013-01-16 21:07:08.000000000 +0100 -+++ libseccomp-2.0.0/Makefile 2013-01-28 17:51:12.258014973 +0100 -@@ -85,7 +85,8 @@ - - install: $(SUBDIRS_BUILD) - @$(ECHO_INFO) "installing in $(INSTALL_PREFIX) ..." -- $(INSTALL_PC_MACRO) libseccomp.pc -+ $(INSTALL) -d $(INSTALL_LIB_DIR)/pkgconfig -+ $(INSTALL) libseccomp.pc $(INSTALL_LIB_DIR)/pkgconfig - @for dir in $(SUBDIRS_INSTALL); do \ - $(ECHO_INFO) "installing from $$dir/"; \ - $(MAKE) -C $$dir install; \ diff --git a/libseccomp.spec b/libseccomp.spec index fa32890..6854645 100644 --- a/libseccomp.spec +++ b/libseccomp.spec @@ -1,17 +1,18 @@ # +# Conditional build: %bcond_without tests +%bcond_without static_libs # don't build static libraries Summary: Enhanced Seccomp (mode 2) Helper library Summary(pl.UTF-8): Rozszerzona biblioteka pomocnicza Seccomp (trybu 2) Name: libseccomp -Version: 2.1.1 -Release: 2 +Version: 2.2.3 +Release: 1 License: LGPL v2.1 Group: Libraries -Source0: http://downloads.sourceforge.net/libseccomp/%{name}-%{version}.tar.gz -# Source0-md5: 1f41207b29e66a7e5e375dd48a64de85 -Patch0: %{name}-pc.patch -URL: http://libseccomp.sourceforge.net/ +Source0: https://github.com/seccomp/libseccomp/releases/download/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 7db418d35d7a6168400bf6b05502f8bf +URL: https://github.com/seccomp/libseccomp BuildRequires: bash BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -58,27 +59,22 @@ Statyczna biblioteka Seccomp. %prep %setup -q -%patch0 -p1 %build -# not autoconf configure -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} +%configure \ + --disable-silent-rules \ + %{!?with_static_libs:--disable-static} +%{__make} -GCC="%{__cc}" \ -CFLAGS="%{rpmcflags} -Wall" \ -%{__make} \ - V=1 - -%{?with_tests:%{__make} check V=1} +%{?with_tests:%{__make} check} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -cp -p src/libseccomp.a $RPM_BUILD_ROOT%{_libdir} +# obsoleted by pkg-config file +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libseccomp.la %clean rm -rf $RPM_BUILD_ROOT @@ -101,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/libseccomp.pc %{_mandir}/man3/seccomp_*.3* +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libseccomp.a +%endif -- 2.44.0