From 7fe06c9ce03e3222ffd7f781275a2b4c3f93b9422aaf685327198059aa1cfffa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Dec 2014 23:47:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cttimeout?expand=0&rev=24 --- libnetfilter_cttimeout.changes | 6 ++++++ libnetfilter_cttimeout.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libnetfilter_cttimeout.changes b/libnetfilter_cttimeout.changes index 4082bbc..42d327c 100644 --- a/libnetfilter_cttimeout.changes +++ b/libnetfilter_cttimeout.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 8 23:47:22 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:43:40 UTC 2014 - jengelh@inai.de diff --git a/libnetfilter_cttimeout.spec b/libnetfilter_cttimeout.spec index 6cb7ac7..fb73b67 100644 --- a/libnetfilter_cttimeout.spec +++ b/libnetfilter_cttimeout.spec @@ -64,15 +64,14 @@ Netfilter extended timeout settings infrastructure. if [ ! -e configure ]; then autoreconf -fi; fi; -%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 @@ -81,7 +80,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/%name/ %_libdir/libnetfilter_cttimeout.so %_libdir/pkgconfig/libnetfilter_cttimeout.pc