From c6a495629fd753dc69ac1353b79fa137876ea4682397c5bb3b528a496516627a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 15:56:36 +0000 Subject: [PATCH] Use /usr/include/pkg OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=36 --- libnetfilter_conntrack.changes | 8 ++++++++ libnetfilter_conntrack.spec | 13 ++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes index edbb651..19b17ca 100644 --- a/libnetfilter_conntrack.changes +++ b/libnetfilter_conntrack.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 23 15:45:35 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 Aug 7 13:09:48 UTC 2013 - jengelh@inai.de diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 57c735b..c162f04 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -34,16 +34,8 @@ Source4: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnfnetlink-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_conntrack is a userspace library providing a programming @@ -76,11 +68,10 @@ libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build -%configure --disable-static --includedir="%_includedir/%name-%version" +%configure --disable-static --includedir="%_includedir/pkg/%name-%version" make %{?_smp_mflags} %install @@ -97,7 +88,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libnetfilter_conntrack.so %_libdir/pkgconfig/libnetfilter_conntrack.pc