From 966dce1f488eb80a84babde2cabfb4de7d565029dfdb71c763411455017929df Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jun 2012 00:01:37 +0000 Subject: [PATCH 1/4] Enable builds for RHEL_6 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cthelper?expand=0&rev=4 --- libnetfilter_cthelper.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libnetfilter_cthelper.spec b/libnetfilter_cthelper.spec index 52b5bac..cd52f43 100644 --- a/libnetfilter_cthelper.spec +++ b/libnetfilter_cthelper.spec @@ -28,13 +28,18 @@ Group: Productivity/Networking/Security #Git-Clone: git://git.netfilter.org/libnetfilter_cthelper Source: %name-%version.tar.xz Source3: baselibs.conf -Patch1: libname.diff +Patch1: libname.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf, automake >= 1.6 -BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake >= 1.6 +BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.21 +%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libmnl) >= 1.0.0 -BuildRequires: xz +%else +BuildRequires: libmnl-devel >= 1.0.0 +%endif +BuildRequires: xz %description This library provides the programming interface (API) to the @@ -58,7 +63,12 @@ This library provides the programming interface (API) to the Netfilter userspace helper infrastructure. %prep +%if 0%{?__xz:1} %setup -qn %name +%else +tar -xf "%{S:0}" --use=xz; +%setup -DTqn %name +%endif %patch -P 1 -p1 %build From c286aebac40df3f07144ef34058c6d2f600456b28a16a2663a96f2335b66187b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jun 2012 01:17:58 +0000 Subject: [PATCH 2/4] Packaging fixes for RHEL/SLES OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cthelper?expand=0&rev=5 --- libnetfilter_cthelper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetfilter_cthelper.spec b/libnetfilter_cthelper.spec index cd52f43..e3c19e5 100644 --- a/libnetfilter_cthelper.spec +++ b/libnetfilter_cthelper.spec @@ -79,7 +79,7 @@ fi; make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot"; rm -f "%buildroot/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig @@ -92,7 +92,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) -%_includedir/libnetfilter_cthelper* +%_includedir/%name-%version %_libdir/libnetfilter_cthelper.so %_libdir/pkgconfig/libnetfilter_cthelper.pc From d0274ac764e2032dba71bb334c67034cd361e50f869764f60e8bdde30e52d142 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jun 2012 17:55:08 +0000 Subject: [PATCH 3/4] Packaging fixes for RHEL/SLES OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cthelper?expand=0&rev=6 --- libnetfilter_cthelper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetfilter_cthelper.spec b/libnetfilter_cthelper.spec index e3c19e5..7f6421a 100644 --- a/libnetfilter_cthelper.spec +++ b/libnetfilter_cthelper.spec @@ -34,7 +34,7 @@ BuildRequires: autoconf BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 %else BuildRequires: libmnl-devel >= 1.0.0 From 3fdb71fdecf672de4d534a7fd6ad5e628be4546931d68f4e9bf01b260fb488c5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 31 Aug 2012 18:06:13 +0000 Subject: [PATCH 4/4] baselibs.conf update OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_cthelper?expand=0&rev=7 --- baselibs.conf | 2 +- libnetfilter_cthelper.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index 80a4350..2a2e460 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libnetfilter_cttimeout1 +libnetfilter_cthelper-0-0 diff --git a/libnetfilter_cthelper.changes b/libnetfilter_cthelper.changes index f6e8882..ef8ea71 100644 --- a/libnetfilter_cthelper.changes +++ b/libnetfilter_cthelper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 31 18:06:01 UTC 2012 - jengelh@inai.de + +- Rectify baselibs.conf to include the right package name + ------------------------------------------------------------------- Mon Jun 4 14:06:19 UTC 2012 - jengelh@inai.de