From 6c1e106893fc6230e77c49eac6e10b4bf4b3037e75cf8fc0630454eab0701ddb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 09:41:42 +0000 Subject: [PATCH 1/6] Freecode is gone OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=35 --- libnetfilter_conntrack.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 72e1ea2..57c735b 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_conntrack # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # 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 @@ Summary: Userspace library for the in-kernel connection tracking state ta License: GPL-2.0+ Group: Productivity/Networking/Security -#Freecode-URL: http://freecode.com/projects/libnetfilter_conntrack/ #Git-Clone: git://git.netfilter.org/libnetfilter_conntrack #DL-URL: http://netfilter.org/projects/libnetfilter_conntrack/files/ Source: http://netfilter.org/projects/libnetfilter_conntrack/files/%name-%version.tar.bz2 From c6a495629fd753dc69ac1353b79fa137876ea4682397c5bb3b528a496516627a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 15:56:36 +0000 Subject: [PATCH 2/6] Use /usr/include/pkg OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=36 --- libnetfilter_conntrack.changes | 8 ++++++++ libnetfilter_conntrack.spec | 13 ++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes index edbb651..19b17ca 100644 --- a/libnetfilter_conntrack.changes +++ b/libnetfilter_conntrack.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 23 15:45:35 UTC 2014 - jengelh@inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator +- Move include files to /usr/include/pkg, like done in many other + packages + ------------------------------------------------------------------- Wed Aug 7 13:09:48 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 57c735b..c162f04 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -34,16 +34,8 @@ Source4: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnfnetlink-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_conntrack is a userspace library providing a programming @@ -76,11 +68,10 @@ libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build -%configure --disable-static --includedir="%_includedir/%name-%version" +%configure --disable-static --includedir="%_includedir/pkg/%name-%version" make %{?_smp_mflags} %install @@ -97,7 +88,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libnetfilter_conntrack.so %_libdir/pkgconfig/libnetfilter_conntrack.pc From 84cfcfbce495442f5709fd618b2533f0faf3dcfa2ee1c1b89498172354ed730b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:32:10 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=37 --- libnetfilter_conntrack.changes | 2 -- libnetfilter_conntrack.spec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes index 19b17ca..8961232 100644 --- a/libnetfilter_conntrack.changes +++ b/libnetfilter_conntrack.changes @@ -3,8 +3,6 @@ Tue Sep 23 15:45:35 UTC 2014 - jengelh@inai.de - Drop gpg-offline build-time requirement; this is now handled by the local source validator -- Move include files to /usr/include/pkg, like done in many other - packages ------------------------------------------------------------------- Wed Aug 7 13:09:48 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index c162f04..993689b 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -71,7 +71,7 @@ used by conntrack-tools among many other applications. %setup -q %build -%configure --disable-static --includedir="%_includedir/pkg/%name-%version" +%configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install From 17017b221b938d109f9e92964ffebac76747444a8c165ead41925f1c514e968a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:32:23 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=38 --- libnetfilter_conntrack.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 993689b..541d54f 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -71,7 +71,7 @@ used by conntrack-tools among many other applications. %setup -q %build -%configure --disable-static --includedir=%_includedir/%name-%version +%configure --disable-static --includedir="%_includedir/%name-%version" make %{?_smp_mflags} %install From 81f6ffb7b8a0d584b1666af74af3cf554ee10c1981c256dac3abc64a1bfef58a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:34:17 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=39 --- libnetfilter_conntrack.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 541d54f..79c29ae 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -88,7 +88,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name-%version/ %_libdir/libnetfilter_conntrack.so %_libdir/pkgconfig/libnetfilter_conntrack.pc From 6d10e1d697943b6adc293c71ea509ef671b6ad481dbfc2bcc0b5cfb26dfbea18 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 10:26:19 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=40 --- libnetfilter_conntrack.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 79c29ae..df718f9 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -88,7 +88,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version/ +%_includedir/%name-%version %_libdir/libnetfilter_conntrack.so %_libdir/pkgconfig/libnetfilter_conntrack.pc