From 977a6cdbdfe06a07fe6e8fb737643d5ae57386e419e2098a0445c55ba5caf127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Fri, 28 Nov 2014 13:19:35 +0000
Subject: [PATCH] - Cleanup with spec-cleaner - Remove obsolete sections of
 provides from 2k6 - Remove static library

OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpd?expand=0&rev=21
---
 tcpd.changes |  7 +++++++
 tcpd.spec    | 44 ++++++++++++++++----------------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/tcpd.changes b/tcpd.changes
index fec37de..0827e8d 100644
--- a/tcpd.changes
+++ b/tcpd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 28 13:18:37 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Remove obsolete sections of provides from 2k6
+- Remove static library
+
 -------------------------------------------------------------------
 Mon Aug 18 16:39:30 UTC 2014 - fcrozat@suse.com
 
diff --git a/tcpd.spec b/tcpd.spec
index f1290eb..f2a3fac 100644
--- a/tcpd.spec
+++ b/tcpd.spec
@@ -16,21 +16,14 @@
 #
 
 
-Name:           tcpd
 %define lname	libwrap0
-Url:            ftp://ftp.porcupine.org/pub/security/index.html
-BuildRequires:  linux-kernel-headers
-Provides:       nkitb:/usr/sbin/tcpd
-# bug437293
-%ifarch ppc64
-Obsoletes:      tcpd-64bit
-%endif
-#
+Name:           tcpd
 Version:        7.6
 Release:        0
 Summary:        A security wrapper for TCP daemons
 License:        BSD-3-Clause
 Group:          Productivity/Networking/System
+Url:            ftp://ftp.porcupine.org/pub/security/index.html
 Source:         ftp://ftp.porcupine.org/pub/security/tcp_wrappers_%{version}.tar.gz
 Source2:        baselibs.conf
 Patch0:         tcp_wrappers_%{version}.diff
@@ -63,6 +56,8 @@ Patch26:        tcp_wrappers_%{version}-fedora-bug17795.diff
 Patch27:        tcp_wrappers_%{version}-fedora-bug17847.diff
 Patch28:        tcp_wrappers_7.6-implicit-decl.patch
 Patch29:        tcpd-ocloexec.patch
+BuildRequires:  linux-kernel-headers
+Provides:       nkitb:%{_sbindir}/tcpd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -70,24 +65,19 @@ This package contains a small daemon program that can monitor and
 filter incoming requests for finger, ftp, telnet, rlogin, rsh, exec,
 tftp, talk, and other network services.
 
-%package -n %lname
+%package -n %{lname}
 Summary:        The TCP wrapper library
 Group:          System/Libraries
 
-%description -n %lname
+%description -n %{lname}
 This package contains a library which implements classifying incoming
-requests (connections) based upon rule exclusion files (/etc/hosts.*).
+requests (connections) based upon rule exclusion files (%{_sysconfdir}/hosts.*).
 
 %package devel
 Summary:        Include Files and Libraries for the TCP wrapper library
-Group:          Productivity/Networking/System
-Requires:       %lname = %{version}
+Group:          Development/Languages/C and C++
+Requires:       %{lname} = %{version}
 Requires:       glibc-devel
-# bug437293
-%ifarch ppc64
-Obsoletes:      tcpd-devel-64bit
-%endif
-#
 
 %description devel
 This package contains the library and header files, which are necessary
@@ -125,9 +115,9 @@ to compile and link programs against the TCP wrapper library.
 %patch27
 %patch28
 %patch29
+
 %build
-# make RPM_OPT_FLAGS="%{optflags} -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
-make %{?_smp_mflags} linux CC="gcc"
+make %{?_smp_mflags} linux CC=cc
 
 %install
 install -d -m 755 %{buildroot}%{_includedir}
@@ -136,7 +126,6 @@ install -d -m 755 %{buildroot}%{_sbindir}
 install -d -m 755 %{buildroot}%{_mandir}/man{1,3,5,8}
 install -d -m 755 %{buildroot}/%{_lib}
 install -m 644 ip6utils.h tcpd.h %{buildroot}%{_includedir}
-install -m 644 libwrap.a %{buildroot}/%{_libdir}
 install -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from %{buildroot}%{_sbindir}
 install -m 644 hosts_access.3 %{buildroot}%{_mandir}/man3
 install -m 644 hosts_access.5 hosts_options.5 %{buildroot}%{_mandir}/man5
@@ -147,26 +136,25 @@ ln -sf libwrap.so.0.%{version} libwrap.so.0
 cd %{buildroot}%{_libdir}
 ln -sf /%{_lib}/libwrap.so.0.%{version} libwrap.so
 
-%post -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
 
-%postun -n %lname -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root)
 %doc BLURB CHANGES DISCLAIMER README README.ipv6 README.NIS
 %doc %{_mandir}/man?/*
 %attr(755,root,root) %{_sbindir}/*
 
-%files -n %lname
+%files -n %{lname}
 %defattr(-,root,root)
 %doc DISCLAIMER
 %attr(755,root,root) /%{_lib}/libwrap.so.0*
 
 %files devel
-%defattr(644,root,root,755)
+%defattr(-,root,root)
 %{_includedir}/tcpd.h
 %{_includedir}/ip6utils.h
-%{_libdir}/libwrap.a
 %{_libdir}/libwrap.so
 
 %changelog