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