From 95ff6085f64b599196090306e1904c5af82bd339011069a81ead408ad104cdca Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 23 Sep 2014 16:02:15 +0000
Subject: [PATCH] Use /usr/include/pkg; drop gpg-offline

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=25
---
 libnetfilter_log.changes |  8 ++++++++
 libnetfilter_log.spec    | 18 ++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/libnetfilter_log.changes b/libnetfilter_log.changes
index 195eb17..4181a24 100644
--- a/libnetfilter_log.changes
+++ b/libnetfilter_log.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:37:20 CET 2012 - sbrabec@suse.cz
 
diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec
index d321b4d..ff39b05 100644
--- a/libnetfilter_log.spec
+++ b/libnetfilter_log.spec
@@ -33,14 +33,7 @@ Source4:        %name.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #BuildRequires:  autoconf, automake >= 1.6, libtool
 BuildRequires:  pkgconfig >= 0.21
-%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
 BuildRequires:  pkgconfig(libnfnetlink) >= 0.0.41
-%else
-BuildRequires:  libnfnetlink-devel >= 0.0.41
-%endif
-%if 0%{?suse_version} >= 1230
-BuildRequires:  gpg-offline
-%endif
 
 %description
 libnetfilter_log is a userspace library providing interface to
@@ -59,10 +52,10 @@ part of a system that deprecates the old syslog/dmesg based packet
 logging. This library has been previously known as libnfnetlink_log.
 
 %package devel
-Requires:       %lname = %version
-Requires:       libnfnetlink-devel
 Summary:        Userspace library for accessing logged packets
 Group:          Development/Libraries/C and C++
+Requires:       %lname = %version
+Requires:       libnfnetlink-devel
 
 %description devel
 libnetfilter_log is a userspace library providing interface to
@@ -71,13 +64,10 @@ part of a system that deprecates the old syslog/dmesg based packet
 logging. This library has been previously known as libnfnetlink_log.
 
 %prep
-%if 0%{?gpg_verify:1}
-%gpg_verify %{S:2}
-%endif
 %setup -q
 
 %build
-%configure --disable-static --includedir=%_includedir/%name-%version
+%configure --disable-static --includedir="%_includedir/pkg/%name-%version"
 make %{?_smp_mflags}
 
 %install
@@ -95,7 +85,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/%name-%version
+%_includedir/pkg/
 %_libdir/libnetfilter_log.so
 %_libdir/libnetfilter_log_libipulog.so
 %_libdir/pkgconfig/libnetfilter_log.pc