From 908fd4d8845b2983e18cf8c416fad23f6be0c588ed961d0312a41a715e63b273 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 09:59:04 +0000 Subject: [PATCH 1/7] Freecode is gone OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=22 --- libnetfilter_acct.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index dacc03a..b3beda7 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_acct # -# 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 @@ License: LGPL-2.1+ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_acct/ -#Freecode-URL: http://freecode.com/projects/libnetfilter_acct/ #Git-Clone: git://git.netfilter.org/libnetfilter_acct #DL-URL: http://netfilter.org/projects/libnetfilter_acct/files/ Source: http://netfilter.org/projects/libnetfilter_acct/files/%name-%version.tar.bz2 From 713113dd21ecca1d3e8ef851199d7a5e7bdfebc7584f7305cb9bc273fe8f88bd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 15:44:54 +0000 Subject: [PATCH 2/7] Drop gpg-offline OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=23 --- libnetfilter_acct.changes | 6 ++++++ libnetfilter_acct.spec | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libnetfilter_acct.changes b/libnetfilter_acct.changes index 8122d34..caf25d5 100644 --- a/libnetfilter_acct.changes +++ b/libnetfilter_acct.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Mon Mar 4 13:52:21 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index b3beda7..b8aadca 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -33,15 +33,9 @@ Source3: baselibs.conf Source4: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool -BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1210 || 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 +BuildRequires: pkgconfig >= 0.21 +BuildRequires: pkgconfig(libmnl) >= 1.0.0 %description This library provides the programming interface (API) to the @@ -65,7 +59,6 @@ This library provides the programming interface (API) to the Netfilter extended accounting infrastructure. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build From 8b5f8eb690f7f9b803365cff5dc5d9db233f6c9818ddf3573eeb07cccab84aef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 15:51:48 +0000 Subject: [PATCH 3/7] Use /usr/include/pkg OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=24 --- libnetfilter_acct.changes | 2 ++ libnetfilter_acct.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnetfilter_acct.changes b/libnetfilter_acct.changes index caf25d5..d4e85bc 100644 --- a/libnetfilter_acct.changes +++ b/libnetfilter_acct.changes @@ -3,6 +3,8 @@ 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 ------------------------------------------------------------------- Mon Mar 4 13:52:21 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index b8aadca..0751bb4 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -62,7 +62,7 @@ Netfilter extended accounting infrastructure. %setup -q %build -%configure --disable-static --includedir=%_includedir/%name-%version +%configure --disable-static --includedir="%_includedir/pkg/%name-%version" make %{?_smp_mflags} %install @@ -79,7 +79,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libnetfilter_acct.so %_libdir/pkgconfig/libnetfilter_acct.pc From 1ff776573639ec9bb0a64e0088114759442974d85622d5f65e7c97f55c152585 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 16:08:06 +0000 Subject: [PATCH 4/7] Drop gpg-offline,! OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=25 --- libnetfilter_acct.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index 0751bb4..8485e89 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -33,7 +33,6 @@ Source3: baselibs.conf Source4: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool -BuildRequires: gpg-offline BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1.0.0 From f3a1a2cfd5761776fe53b71a50a5fba18908b78fbd97f82777e5bb86475648c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:31:33 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=26 --- libnetfilter_acct.changes | 2 -- libnetfilter_acct.spec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libnetfilter_acct.changes b/libnetfilter_acct.changes index d4e85bc..caf25d5 100644 --- a/libnetfilter_acct.changes +++ b/libnetfilter_acct.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 ------------------------------------------------------------------- Mon Mar 4 13:52:21 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index 8485e89..0b69490 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -61,7 +61,7 @@ Netfilter extended accounting infrastructure. %setup -q %build -%configure --disable-static --includedir="%_includedir/pkg/%name-%version" +%configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install From 57ed1bf9ccb4a7e89edb9e0b5355f86b8b818cd1bbef18433ac45f3880ea12e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 09:33:45 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=27 --- libnetfilter_acct.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index 0b69490..8a6647e 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -78,7 +78,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name-%version/ %_libdir/libnetfilter_acct.so %_libdir/pkgconfig/libnetfilter_acct.pc From 5adc43b4956fe85d4c56a986918a43b4f65eccaa56f93ecfebdd1be1b352d0be Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Sep 2014 10:20:06 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=28 --- libnetfilter_acct.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index 8a6647e..358c814 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -78,7 +78,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version/ +%_includedir/%name-%version %_libdir/libnetfilter_acct.so %_libdir/pkgconfig/libnetfilter_acct.pc