From eaa9b1ec5477021170ab6894f99ca13edd4fed21b85642e220e210d3cc5e3e9e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Dec 2012 01:50:09 +0000 Subject: [PATCH 1/6] Add Freecode URL OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=17 --- libnetfilter_cttimeout.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index aa7c2e8..6cd247a 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -25,6 +25,7 @@ Summary: Userspace library for the Netfilter Conntrack Timeout extension License: GPL-2.0+ Group: Productivity/Networking/Security +#Freecode-URL: http://freecode.com/projects/libnetfilter_cttimeout/ #Git-Clone: git://git.netfilter.org/libnetfilter_cttimeout Source: ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/%name-%version.tar.bz2 Source2: ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/%name-%version.tar.bz2.sig From efda2141ba3b398ef3ea42b8fc2b7fac5327de36d48cdbcdcb01cccf3cc19bb0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 09:42:04 +0000 Subject: [PATCH 2/6] Freecode is gone OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=18 --- libnetfilter_cttimeout.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 6cd247a..73dcf14 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_cttimeout # -# 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 @@ Summary: Userspace library for the Netfilter Conntrack Timeout extension License: GPL-2.0+ Group: Productivity/Networking/Security -#Freecode-URL: http://freecode.com/projects/libnetfilter_cttimeout/ #Git-Clone: git://git.netfilter.org/libnetfilter_cttimeout Source: ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/%name-%version.tar.bz2 Source2: ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/%name-%version.tar.bz2.sig From 653dd57eeba9bd9d3f81483d75d27ee15d98dcb6e7238451db4269be7399e9d7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 16:01:27 +0000 Subject: [PATCH 3/6] Use /usr/include/pkg; drop gpg-offline OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=19 --- libnetfilter_cttimeout.changes | 8 ++++++++ libnetfilter_cttimeout.spec | 16 +++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libnetfilter_cttimeout.changes b/libnetfilter_cttimeout.changes index ac34cfd..3e2b127 100644 --- a/libnetfilter_cttimeout.changes +++ b/libnetfilter_cttimeout.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:30:40 CET 2012 - sbrabec@suse.cz diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 73dcf14..32cf48f 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -34,14 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: glibc-devel >= 2.9 BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description This library provides the programming interface (API) to the @@ -56,25 +49,22 @@ This library provides the programming interface (API) to the Netfilter extended timeout settings infrastructure. %package devel -Requires: %lname = %version Summary: Userspace library for the Netfilter Conntrack Timeout extension Group: Development/Libraries/C and C++ +Requires: %lname = %version %description devel This library provides the programming interface (API) to the Netfilter extended timeout settings infrastructure. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build if [ ! -e configure ]; then autoreconf -fi; fi; -%configure --disable-static --includedir=%_includedir/%name-%version +%configure --disable-static --includedir="%_includedir/pkg/%name-%version" make %{?_smp_mflags} %install @@ -91,7 +81,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libnetfilter_cttimeout.so %_libdir/pkgconfig/libnetfilter_cttimeout.pc From a6a100eebf668747a6b26cb289d896872a0648390454f05b57a1d1c34fc60eb4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:33:05 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=20 --- libnetfilter_cttimeout.changes | 2 -- libnetfilter_cttimeout.spec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libnetfilter_cttimeout.changes b/libnetfilter_cttimeout.changes index 3e2b127..4082bbc 100644 --- a/libnetfilter_cttimeout.changes +++ b/libnetfilter_cttimeout.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:30:40 CET 2012 - sbrabec@suse.cz diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 32cf48f..740ce8d 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -64,7 +64,7 @@ Netfilter extended timeout settings infrastructure. if [ ! -e configure ]; then autoreconf -fi; fi; -%configure --disable-static --includedir="%_includedir/pkg/%name-%version" +%configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install From 6ff45bfd372f097678276f8fe9b8f98015bc102d9565a7b056106e55bf379f1a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:35:42 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=21 --- libnetfilter_cttimeout.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 740ce8d..4cfac28 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -81,7 +81,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name-%version/ %_libdir/libnetfilter_cttimeout.so %_libdir/pkgconfig/libnetfilter_cttimeout.pc From 1194636d4bd491707adf6cb135d26d8e19a10c7633d6dc81ff4437721d9b9cd5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 10:26:46 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=22 --- libnetfilter_cttimeout.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 4cfac28..6cb7ac7 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -81,7 +81,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version/ +%_includedir/%name-%version %_libdir/libnetfilter_cttimeout.so %_libdir/pkgconfig/libnetfilter_cttimeout.pc