From 2f1ddfbe6080c9bfa97513693a0723aed7f5a6a82ebac9131a61a897d3817246 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Dec 2012 01:51:23 +0000 Subject: [PATCH 1/6] Add Freecode URL OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=32 --- libnetfilter_queue.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 76f8580..31f2c31 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -25,6 +25,7 @@ License: GPL-2.0 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_queue/ +#Freecode-URL: http://freecode.com/projects/libnetfilter_queue/ #Git-Clone: git://git.netfilter.org/libnetfiler_queue #DL-URL: http://netfilter.org/projects/libnetfilter_queue/files/ Source: http://netfilter.org/projects/libnetfilter_queue/files/%name-%version.tar.bz2 From 11607de9087133be27065328746f4f3e4258a18daecaa8903d1ea38fbe4f2e66 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 09:42:19 +0000 Subject: [PATCH 2/6] Freecode is gone OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=33 --- libnetfilter_queue.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 31f2c31..7daac93 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_queue # -# Copyright (c) 2012 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 @@ License: GPL-2.0 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_queue/ -#Freecode-URL: http://freecode.com/projects/libnetfilter_queue/ #Git-Clone: git://git.netfilter.org/libnetfiler_queue #DL-URL: http://netfilter.org/projects/libnetfilter_queue/files/ Source: http://netfilter.org/projects/libnetfilter_queue/files/%name-%version.tar.bz2 From 14df859b107a423612ef976ab3e2bc680d264ea9b23ed487abfa313dfe77528f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 16:03:19 +0000 Subject: [PATCH 3/6] Use /usr/include/pkg; drop gpg-offline OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=34 --- libnetfilter_queue.changes | 8 ++++++++ libnetfilter_queue.spec | 20 ++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/libnetfilter_queue.changes b/libnetfilter_queue.changes index b9414eb..ea06f0c 100644 --- a/libnetfilter_queue.changes +++ b/libnetfilter_queue.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 23 15:43:40 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 Nov 28 20:40:28 CET 2012 - sbrabec@suse.cz diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 7daac93..6371205 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -32,20 +32,11 @@ Source2: http://netfilter.org/projects/libnetfilter_queue/files/%name-%ve Source3: baselibs.conf Source4: %name.keyring Patch1: rhel6-iptos.diff - BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnfnetlink) >= 0.0.41 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnfnetlink-devel >= 0.0.41 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_queue is a userspace library providing an API to packets @@ -66,10 +57,10 @@ system that deprecates the old ip_queue / libipq mechanism. libnetfilter_queue has been previously known as libnfnetlink_queue. %package devel -Requires: %lname = %version -Requires: libnfnetlink-devel Summary: Userspace library for packets that have been queued by the kernel packet filter Group: Development/Libraries/C and C++ +Requires: %lname = %version +Requires: libnfnetlink-devel %description devel libnetfilter_queue is a userspace library providing an API to packets @@ -79,14 +70,11 @@ system that deprecates the old ip_queue / libipq mechanism. libnetfilter_queue has been previously known as libnfnetlink_queue. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %patch -P 1 -p1 %build -%configure --disable-static --includedir=%_includedir/%name-%version +%configure --disable-static --includedir="%_includedir/pkg/%name-%version" make %{?_smp_mflags} KERNELDIR="ignore"; %install @@ -103,7 +91,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libnetfilter_queue.so %_libdir/pkgconfig/libnetfilter_queue.pc From 08e755a16e931fdbac850f5756d9a049610764d6fa5bfd323770185caf122b06 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:37:51 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=35 --- libnetfilter_queue.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 6371205..34ea9de 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -74,7 +74,7 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %patch -P 1 -p1 %build -%configure --disable-static --includedir="%_includedir/pkg/%name-%version" +%configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} KERNELDIR="ignore"; %install @@ -91,7 +91,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name-%version/ %_libdir/libnetfilter_queue.so %_libdir/pkgconfig/libnetfilter_queue.pc From 9b34ff224a30e579d4544c89aee6042c821c937d11eea754e005acc772d354df Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 10:27:03 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=36 --- libnetfilter_queue.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 34ea9de..978294e 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -91,7 +91,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version/ +%_includedir/%name-%version %_libdir/libnetfilter_queue.so %_libdir/pkgconfig/libnetfilter_queue.pc From 1f6588ce522125633036f1b186e35202abb4cdd01bb650352b395bd4e2a6d3aa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 10:57:47 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=37 --- libnetfilter_queue.changes | 2 -- 1 file changed, 2 deletions(-) diff --git a/libnetfilter_queue.changes b/libnetfilter_queue.changes index ea06f0c..e5f113a 100644 --- a/libnetfilter_queue.changes +++ b/libnetfilter_queue.changes @@ -3,8 +3,6 @@ Tue Sep 23 15:43:40 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 Nov 28 20:40:28 CET 2012 - sbrabec@suse.cz