rpms/tcp_wrappers/devel tcp_wrappers.spec,1.39,1.40

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/tcp_wrappers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3945

Modified Files:
	tcp_wrappers.spec 
Log Message:
Merge review



Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- tcp_wrappers.spec	27 Jul 2009 05:39:11 -0000	1.39
+++ tcp_wrappers.spec	6 Jan 2010 10:01:37 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons
 Name: tcp_wrappers
 Version: 7.6
-Release: 56%{?dist}
+Release: 57%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -34,10 +34,9 @@ Patch20: tcp_wrappers-7.6-sigchld.patch
 Patch21: tcp_wrappers-7.6-196326.patch
 Patch22: tcp_wrappers_7.6-249430.patch
 # required by sin_scope_id in ipv6 patch
-BuildRequires: glibc-devel >= 2.2		
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: glibc-devel >= 2.2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: tcp_wrappers-libs = %{version}-%{release}
-Obsoletes: tcp_wrappers < 7.6-41
 
 %description
 The tcp_wrappers package provides small daemon programs which can
@@ -50,7 +49,7 @@ filtering incoming network services requ
 This version also supports IPv6.
 
 %package libs
-Summary: tcp_wrappers libraries
+Summary: Libraries for tcp_wrappers
 Group: System Environment/Libraries
 Obsoletes: tcp_wrappers < 7.6-41
 
@@ -58,7 +57,7 @@ Obsoletes: tcp_wrappers < 7.6-41
 tcp_wrappers-libs contains the libraries of the tcp_wrappers package.
 
 %package devel
-Summary: tcp_wrappers development libraries and headers
+Summary: Development libraries and headers for tcp_wrappers
 Group: Development/Libraries
 Obsoletes: tcp_wrappers < 7.6-41
 Requires: tcp_wrappers-libs = %{version}-%{release}
@@ -109,7 +108,8 @@ install -p -m644 tcpd.8 tcpdchk.8 tcpdma
 ln -sf hosts_access.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/hosts.allow.5
 ln -sf hosts_access.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/hosts.deny.5
 #cp -a libwrap.a ${RPM_BUILD_ROOT}%{_libdir}
-cp -a libwrap.so* ${RPM_BUILD_ROOT}/%{_lib}
+#cp -a libwrap.so* ${RPM_BUILD_ROOT}/%{_lib}
+install -p -m644 libwrap.so* ${RPM_BUILD_ROOT}/%{_lib}
 install -p -m644 tcpd.h ${RPM_BUILD_ROOT}%{_includedir}
 install -m755 safe_finger ${RPM_BUILD_ROOT}%{_sbindir}
 install -m755 tcpd ${RPM_BUILD_ROOT}%{_sbindir}
@@ -148,6 +148,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan  6 2010 Jan F. Chadima <jchadima at redhat.com> - 7.6-57
+- Merge review (#226482)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.6-56
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild