From af3495a2cc0084a256ea5705898974067e0d731435aa64262f0b9d716b59d4ea Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Dec 2014 23:46:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_conntrack?expand=0&rev=42 --- libnetfilter_conntrack.changes | 6 ++++++ libnetfilter_conntrack.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes index 8961232..6cbd377 100644 --- a/libnetfilter_conntrack.changes +++ b/libnetfilter_conntrack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 8 23:44:17 UTC 2014 - jengelh@inai.de + +- Drop %version from subincludedir, it tends to break recompiles of + already-built trees on library updates. + ------------------------------------------------------------------- Tue Sep 23 15:45:35 UTC 2014 - jengelh@inai.de diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index df718f9..86c6cb5 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -71,15 +71,14 @@ used by conntrack-tools among many other applications. %setup -q %build -%configure --disable-static --includedir="%_includedir/%name-%version" +%configure --disable-static --includedir="%_includedir/%name" make %{?_smp_mflags} %install -make install DESTDIR="%buildroot"; -rm -f "%buildroot/%_libdir"/*.la; - -%post -n %lname -p /sbin/ldconfig +%make_install +rm -f "%buildroot/%_libdir"/*.la +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname @@ -88,7 +87,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/%name/ %_libdir/libnetfilter_conntrack.so %_libdir/pkgconfig/libnetfilter_conntrack.pc