From 8cf6b9cda0bc373b0db003bb4793da4a5808a5f2c9ad9f85c205ccf8b2e50f41 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Dec 2014 23:40:39 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=30 --- libnetfilter_acct.changes | 6 ++++++ libnetfilter_acct.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libnetfilter_acct.changes b/libnetfilter_acct.changes index caf25d5..d344230 100644 --- a/libnetfilter_acct.changes +++ b/libnetfilter_acct.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 8 23:39:19 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_acct.spec b/libnetfilter_acct.spec index 358c814..dfc0936 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -61,7 +61,7 @@ Netfilter extended accounting infrastructure. %setup -q %build -%configure --disable-static --includedir=%_includedir/%name-%version +%configure --disable-static --includedir="%_includedir/%name" make %{?_smp_mflags} %install @@ -78,7 +78,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/%name-%version +%_includedir/%name/ %_libdir/libnetfilter_acct.so %_libdir/pkgconfig/libnetfilter_acct.pc From d878356bb9d75b5c079cf8f8aa5addc484712444b433094a55f021c341b114b6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Dec 2014 23:53:32 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_acct?expand=0&rev=31 --- libnetfilter_acct.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libnetfilter_acct.spec b/libnetfilter_acct.spec index dfc0936..b713c5f 100644 --- a/libnetfilter_acct.spec +++ b/libnetfilter_acct.spec @@ -65,11 +65,10 @@ Netfilter extended accounting infrastructure. 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