Accepting request 98330 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/98330
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnfnetlink?expand=0&rev=8

libnfnetlink.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 22 15:18:35 UTC 2011 - jengelh@medozas.de
+
+- Make License field SPDX compliant (bnc#731935)
+
+-------------------------------------------------------------------
+Sat Nov 19 20:43:44 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
 -------------------------------------------------------------------
 Sat Apr 24 09:16:28 UTC 2010 - coolo@novell.com
 

libnfnetlink.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package libnfnetlink (Version 1.0.0+git1)
+# spec file for package libnfnetlink
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
-%define soname 0
 
 Name:           libnfnetlink
+%define libsoname	%{name}0
 Version:        1.0.0+git1
 Release:        2
-License:        GNU GPL v2
+License:        GPL-2.0
 Group:          Productivity/Networking/Security
-Url:            http://netfilter.org/projects/libnfnetlink/
+URL:            http://netfilter.org/projects/libnfnetlink/
-#Source:		http://netfilter.org/projects/libnfnetlink/files/%{name}-%{version}.tar.bz2
+
-Source:         %{name}-%{version}.tar.xz
+#Git-Clone:	git://git.netfilter.org/libnfnetlink
+#DL-URL:	ftp://ftp.netfilter.org/pub/libnfnetlink/
+#Source:		http://netfilter.org/projects/libnfnetlink/files/%name-%version.tar.bz2
+Source:         %name-%version.tar.xz
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  linux-kernel-headers >= 2.6.14 pkg-config xz
+BuildRequires:  pkgconfig
-Summary:        Low-Level Library for netfilter related Kernel/Userspace Communication
+BuildRequires:  xz
+BuildRequires:  libtool
+Summary:        Low-level library for Netfilter-related kernel/userspace communication
 
 %description
 libnfnetlink is the low-level library for netfilter related
@@ -43,15 +47,13 @@ This library is not meant as a public API for application developers.
 It is only used by other netfilter.org projects, such as
 libnetfilter_log, libnetfilter_queue or libnetfilter_conntrack.
 
-%define debug_package_requires %{name}%{soname} = %{version}-%{release}
+%define debug_package_requires %libsoname = %version-%release
-
-%package -n %{name}%{soname}
-
 
+%package -n %libsoname
 Group:          System/Libraries
-Summary:        Low-Level Library for netfilter related Kernel/Userspace Communication
+Summary:        Low-level library for Netfilter-related kernel/userspace communication
 
-%description -n %{name}%{soname}
+%description -n %libsoname
 libnfnetlink is the low-level library for netfilter related
 kernel/userspace communication. It provides a generic messaging
 infrastructure for in-kernel netfilter subsystems (such as
@@ -62,14 +64,12 @@ This library is not meant as a public API for application developers.
 It is only used by other netfilter.org projects, such as
 libnetfilter_log, libnetfilter_queue or libnetfilter_conntrack.
 
-%package -n %{name}-devel
+%package -n %name-devel
-
-
 Group:          Development/Libraries/C and C++
-Requires:       %{name}%{soname} = %{version}
+Requires:       %libsoname = %version
-Summary:        Low-Level Library for netfilter related Kernel/Userspace Communication
+Summary:        Low-level library for Netfilter-related kernel/userspace communication
 
-%description -n %{name}-devel
+%description -n %name-devel
 libnfnetlink is the low-level library for netfilter related
 kernel/userspace communication. It provides a generic messaging
 infrastructure for in-kernel netfilter subsystems (such as
@@ -81,35 +81,37 @@ It is only used by other netfilter.org projects, such as
 libnetfilter_log, libnetfilter_queue or libnetfilter_conntrack.
 
 %prep
+%if 0%{?__xz:1}
 %setup -q
+%else
+tar -xf "%{S:0}" --use=xz;
+%setup -DTq
+%endif
 
 %build
 if [ ! -e configure ]; then
 	./autogen.sh
 fi
 %configure --disable-static
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
-find %{buildroot} -name "*.la" -delete
+find %buildroot -name "*.la" -delete
 
-%post -n %{name}%{soname} -p /sbin/ldconfig
+%post -n %libsoname -p /sbin/ldconfig
 
-%postun -n %{name}%{soname} -p /sbin/ldconfig
+%postun -n %libsoname -p /sbin/ldconfig
 
-%clean
+%files -n %libsoname
-test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
-
-%files -n %{name}%{soname}
 %defattr(-,root,root)
 %doc COPYING README
-%{_libdir}/libnfnetlink.so.%{soname}*
+%_libdir/libnfnetlink.so.*
 
-%files -n %{name}-devel
+%files -n %name-devel
 %defattr(-,root,root)
-%{_includedir}/libnfnetlink
+%_includedir/libnfnetlink
-%{_libdir}/libnfnetlink.so
+%_libdir/libnfnetlink.so
-%{_libdir}/pkgconfig/libnfnetlink.pc
+%_libdir/pkgconfig/libnfnetlink.pc
 
 %changelog