SPECS: tcp_wrappers.spec - need libwrap-libs for multilib libwrap ...

[glen]

Author: glen                         Date: Sat Jan  7 00:38:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- need libwrap-libs for multilib libwrap (config files created .rpmnew with each upgrade). any better ideas?
- add libtool patch

---- Files affected:
SPECS:
   tcp_wrappers.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/tcp_wrappers.spec
diff -u SPECS/tcp_wrappers.spec:1.77 SPECS/tcp_wrappers.spec:1.78
--- SPECS/tcp_wrappers.spec:1.77	Tue Dec 27 20:40:55 2005
+++ SPECS/tcp_wrappers.spec	Sat Jan  7 01:38:47 2006
@@ -27,6 +27,7 @@
 Patch7:		%{name}-man_fixes.patch
 Patch8:		%{name}-weak-severity.patch
 Patch9:		%{name}-libdir.patch
+Patch10:	%{name}-libtool.patch
 BuildRequires:	libtool
 Requires:	libwrap = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,8 +78,8 @@
 Summary(ru):	Security wrapper ÄĚŃ tcp-ÄĹÍĎÎĎ×. âÉÂĚÉĎÔĹËÉ ŇÁÚŇÁÂĎÔŢÉËÁ É ČĹÄĹŇÁ
 Summary(uk):	Security wrapper ÄĚŃ tcp-ÄĹÍĎÎŚ×. âŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ ÔÁ ČĹÄĹŇÉ
 Group:		Libraries
-Requires(post):	/sbin/ldconfig
 Requires(post):	fileutils
+Requires:	libwrap-libs = %{version}-%{release}
 Conflicts:	tcp_wrappers < 7.6-28
 
 %description -n libwrap
@@ -91,17 +92,27 @@
 dostępu bazującą na języku reguł, opcjonalnie z komendami powłoki
 wykowywanymi zależnie od ustawionej regułki.
 
+%package -n libwrap-libs
+Summary:	Security wrapper access control library
+Group:		Libraries
+Conflicts:	tcp_wrappers < 7.6-28
+
+%description -n libwrap-libs
+Security wrapper access control library which implement a rule-based
+access control language with optional shell commands that are executed
+when a rule fires.
+
 %package -n libwrap-devel
 Summary:	Header file and documentation for security wrapper access control library
 Summary(pl):	Plik nagłówkowy i dokumentacja do biblioteki wrappera bezpieczeństwa
 Group:		Development/Libraries
-Requires:	libwrap = %{version}-%{release}
+Requires:	libwrap-libs = %{version}-%{release}
 
 %description -n libwrap-devel
 Header file and programmer's documentation for libwrap, security
 wrapper access control library which implement a rule-based access
-control language with optional shell commands that are executed
-when a rule fires.
+control language with optional shell commands that are executed when a
+rule fires.
 
 %description -n libwrap-devel -l pl
 Plik nagłówkowy i dokumentacja programisty do libwrap - biblioteki
@@ -177,6 +188,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__make} linux \
@@ -193,7 +205,7 @@
 
 %{__make} install \
 	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-	LIBDIR=$RPM_BUILD_ROOT%{_libdir} 
+	LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 mv $RPM_BUILD_ROOT%{_libdir}/libwrap.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libwrap.so.*.*.*) \
@@ -212,19 +224,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n libwrap
-/sbin/ldconfig
 if [ -f /etc/hosts.allow -o -f /etc/host.deny ]; then
 	if [ ! -L /etc/hosts.allow ]; then
-		mv -f /etc/tcpd/hosts.allow /etc/tcpd/hosts.allow.newrpm
+		mv -f /etc/tcpd/hosts.allow{,.rpmnew}
 		mv -f /etc/hosts.allow /etc/tcpd
 	fi
 	if [ ! -L /etc/tcpd/hosts.deny ]; then
-		mv -f /etc/tcpd/hosts.deny  /etc/tcpd/hosts.deny.newrpm
+		mv -f /etc/tcpd/hosts.deny{,.rpmnew}
 		mv -f /etc/hosts.deny /etc/tcpd
 	fi
 fi
 
-%postun -n libwrap -p /sbin/ldconfig
+%post	-n libwrap-libs -p /sbin/ldconfig
+%postun	-n libwrap-libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -236,9 +248,12 @@
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/tcpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tcpd/hosts.*
-%attr(755,root,root) /%{_lib}/libwrap.so.*.*
 %{_mandir}/man5/*
 
+%files -n libwrap-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libwrap.so.*.*
+
 %files -n libwrap-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwrap.so
@@ -256,6 +271,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2006/01/07 00:38:47  glen
+- need libwrap-libs for multilib libwrap (config files created .rpmnew with each upgrade). any better ideas?
+- add libtool patch
+
 Revision 1.77  2005/12/27 19:40:55  qboosh
 - should be lib64-aware; release 39
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tcp_wrappers.spec?r1=1.77&r2=1.78&f=u