From af97781704a74fbd64d08effd99bb6627c1c3ab1704e0b22d6f5c09862bbc55b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 21 Jan 2013 10:31:32 +0000 Subject: [PATCH] Accepting request 149340 from home:jengelh:branches:network:utilities - Implement shared library packaging guidelines (split libwrap0) - Parallel build with %_smp_mflags instead of %jobs - Remove redundant %clean sections OBS-URL: https://build.opensuse.org/request/show/149340 OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpd?expand=0&rev=12 --- baselibs.conf | 2 +- tcpd.changes | 7 +++++++ tcpd.spec | 28 +++++++++++++++++++--------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index ede1a37..dcbabf3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -tcpd +libwrap0 arch ppc package tcpd-devel diff --git a/tcpd.changes b/tcpd.changes index f51c9a9..a4a87fc 100644 --- a/tcpd.changes +++ b/tcpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 20 01:29:11 UTC 2013 - jengelh@inai.de + +- Implement shared library packaging guidelines (split libwrap0) +- Parallel build with %_smp_mflags instead of %jobs +- Remove redundant %clean sections + ------------------------------------------------------------------- Sun Apr 22 01:18:07 UTC 2012 - crrodriguez@opensuse.org diff --git a/tcpd.spec b/tcpd.spec index 9ac9f3d..b14b5d9 100644 --- a/tcpd.spec +++ b/tcpd.spec @@ -1,7 +1,7 @@ # # spec file for package tcpd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,6 +17,7 @@ Name: tcpd +%define lname libwrap0 Url: ftp://ftp.porcupine.org/pub/security/index.html Provides: nkitb:/usr/sbin/tcpd BuildRequires: linux-kernel-headers @@ -74,10 +75,18 @@ Authors: -------- Wietse Venema +%package -n %lname +Summary: The TCP wrapper library +Group: System/Libraries + +%description -n %lname +This package contains a library which implements classifying incoming +requests (connections) based upon rule exclusion files (/etc/hosts.*). + %package devel Summary: Include Files and Libraries for the TCP wrapper library Group: Productivity/Networking/System -Requires: %{name} = %{version} +Requires: %lname = %version Requires: glibc-devel # bug437293 %ifarch ppc64 @@ -125,7 +134,7 @@ to compile and link programs against the TCP wrapper library. %build # make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux -make %{?jobs:-j%jobs} linux CC="%{__cc}" +make %{?_smp_mflags} linux CC="%{__cc}" %install install -d -m 755 $RPM_BUILD_ROOT%{_includedir} @@ -145,20 +154,21 @@ ln -sf libwrap.so.0.%{version} libwrap.so.0 cd $RPM_BUILD_ROOT%{_libdir} ln -sf /%{_lib}/libwrap.so.0.%{version} libwrap.so -%clean -[ -d $RPM_BUILD_ROOT -a "$RPM_BUILD_ROOT" != "" ] && rm -rf $RPM_BUILD_ROOT +%post -n %lname -p /sbin/ldconfig -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(644,root,root,755) %doc BLURB CHANGES DISCLAIMER README README.ipv6 README.NIS %doc %{_mandir}/man?/* -%attr(755,root,root) /%{_lib}/libwrap.so.* %attr(755,root,root) %{_sbindir}/* +%files -n %lname +%defattr(-,root,root) +%doc DISCLAIMER +%attr(755,root,root) /%_lib/libwrap.so.0* + %files devel %defattr(644,root,root,755) %{_includedir}/tcpd.h