SPECS: pam.spec - move libs from main to -libs package - fix re-en...

[glen]

Author: glen                         Date: Fri Sep 16 02:42:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move libs from main to -libs package
- fix re-entrant install
- cleanups

---- Files affected:
SPECS:
   pam.spec (1.224 -> 1.225) 

---- Diffs:

================================================================
Index: SPECS/pam.spec
diff -u SPECS/pam.spec:1.224 SPECS/pam.spec:1.225
--- SPECS/pam.spec:1.224	Mon Aug 22 17:51:18 2005
+++ SPECS/pam.spec	Fri Sep 16 04:42:04 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - something wrong for doc/ps,pdf generation on my build host. remove completely duplicated doc formats?
 #
 # Conditional build:
 %bcond_with	pwexport	# enable pam_pwexport module (needs hacked pam_unix)
@@ -22,7 +24,7 @@
 Summary(uk):	śÎÓÔŇŐÍĹÎÔ, ÝĎ ÚÁÂĹÚĐĹŢŐ¤ ÁŐÔĹÎÔÉĆŚËÁĂŚŔ ÄĚŃ ĐŇĎÇŇÁÍ
 Name:		pam
 Version:	0.80.1
-Release:	1
+Release:	1.4
 Epoch:		0
 License:	GPL or BSD
 Group:		Base
@@ -50,6 +52,7 @@
 BuildRequires:	tetex-metafont
 BuildRequires:	tetex-tex-babel
 %endif
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	awk
 Requires:	cracklib
 Requires:	cracklib-dicts
@@ -124,6 +127,13 @@
 ÎĹĎÂČĎÄÉÍĎÓÔÉ ĐĹŇĹËĎÍĐÉĚĚŃĂÉÉ ÓÁÍĎĘ ĐŇĎÇŇÁÍÍŮ. üÔĎ ÂÁÚĎ×ŮĘ ÍĹČÁÎÉÚÍ
 ÁŐÔĹÎÔÉËÁĂÉÉ × PLD Linux.
 
+%package libs
+Summary:	PAM modules and libraries
+Group:		Libraries
+
+%description libs
+Core PAM modules and libraries.
+
 %package devel
 Summary:	PAM header files
 Summary(pl):	Pliki nagłówkowe i dokumentacja programisty do PAM
@@ -284,8 +294,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f doc/{ps,txts}/{README,*.log} \
-	doc/{html,txts}/Makefile*
+rm -rf docs
+cp -a doc docs
+rm -f docs/{ps,txts}/{README,*.log} \
+	docs/{html,txts}/Makefile*
 
 :> $RPM_BUILD_ROOT/etc/security/opasswd
 :> $RPM_BUILD_ROOT/etc/security/blacklist
@@ -303,16 +315,33 @@
 
 # useless - shut up check-files
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpamcrypt.a
+
+%if %{without selinux}
+rm -rf $RPM_BUILD_ROOT{/%{_lib}/security/pam_selinux.so,%{_sbindir}/pam_selinux_check,%{_mandir}/man8/pam_selinux*.8*}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG ChangeLog Copyright doc/CREDITS %{?with_doc:doc/{html,txts,ps/*.ps,specs/*.{raw,txt}}}
+%doc CHANGELOG ChangeLog Copyright doc/CREDITS
+%if %{with doc}
+%doc docs/{html,txts,specs/*.{raw,txt}}
+# FIXME: doesn't build for me! missing BR!:
+#builder at pld-i686 ps $  sgml2latex -o ps ../psgml2latex -o ps ../pam
+#Processing file ../pam
+#load_char_maps: no entity maps found
+#parse_data: no entity map for `[lowbar]'
+#sh: latex: not found
+#sh: latex: not found
+#dvips: ! DVI file can't be opened.
+#%doc docs/ps/*.ps
+%endif
 %dir /etc/pam.d
 %dir /sbin/pam_filter
 %dir /var/lock/console
@@ -329,6 +358,19 @@
 %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist
 %config(noreplace) %verify(not md5 size mtime) /etc/security/pam_mail.conf
 %attr(600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/opasswd
+%attr(755,root,root) /sbin/pam_filter/upperLOWER
+%attr(4755,root,root) /sbin/unix_chkpwd
+%attr(755,root,root) %{_bindir}/pam_pwgen
+%attr(755,root,root) %{_sbindir}/pam_tally
+%attr(755,root,root) %{_sbindir}/pwgen_trigram
+%{_mandir}/man5/*
+%{_mandir}/man8/pam.*
+%{_mandir}/man8/pam_localuser*
+%{_mandir}/man8/pam_succeed_if*
+%{_mandir}/man8/pam_xauth*
+
+%files libs
+%defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/lib*.so.*.*
 %attr(755,root,root) /%{_lib}/security/pam_access.so
 %attr(755,root,root) /%{_lib}/security/pam_console.so
@@ -368,16 +410,6 @@
 %attr(755,root,root) /%{_lib}/security/pam_wheel.so
 %attr(755,root,root) /%{_lib}/security/pam_xauth.so
 %{?with_pwexport:%attr(755,root,root) /%{_lib}/security/pam_pwexport.so}
-%attr(755,root,root) /sbin/pam_filter/upperLOWER
-%attr(4755,root,root) /sbin/unix_chkpwd
-%attr(755,root,root) %{_bindir}/pam_pwgen
-%attr(755,root,root) %{_sbindir}/pam_tally
-%attr(755,root,root) %{_sbindir}/pwgen_trigram
-%{_mandir}/man5/*
-%{_mandir}/man8/pam.*
-%{_mandir}/man8/pam_localuser*
-%{_mandir}/man8/pam_succeed_if*
-%{_mandir}/man8/pam_xauth*
 
 %files devel
 %defattr(644,root,root,755)
@@ -446,6 +478,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2005/09/16 02:42:04  glen
+- move libs from main to -libs package
+- fix re-entrant install
+- cleanups
+
 Revision 1.224  2005/08/22 15:51:18  baggins
 - 0.80.1
 - fix modules miscompile due to lack of includes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.224&r2=1.225&f=u