packages: ppp/ppp.spec - use %{_libdir}/pppd/plugins dir, add todo about ve...

[glen]

Author: glen                         Date: Mon Apr  2 08:47:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use %{_libdir}/pppd/plugins dir, add todo about versioned dir drop

---- Files affected:
packages/ppp:
   ppp.spec (1.152 -> 1.153) 

---- Diffs:

================================================================
Index: packages/ppp/ppp.spec
diff -u packages/ppp/ppp.spec:1.152 packages/ppp/ppp.spec:1.153
--- packages/ppp/ppp.spec:1.152	Sat Jan 29 01:07:13 2011
+++ packages/ppp/ppp.spec	Mon Apr  2 10:47:41 2012
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 # - check mppc patch
+# - check if %{_libdir}/pppd/%{version} path is needed, if not drop the symlink
 
 # Conditional build:
 %bcond_without	pppoatm	# without PPPoATM plugin (which requires kernel 2.4 and atm-devel)
@@ -17,7 +18,7 @@
 Summary(zh_CN.UTF-8):	PPP 配置和管理软件包.
 Name:		ppp
 Version:	2.4.5
-Release:	5
+Release:	6
 Epoch:		3
 License:	distributable
 Group:		Networking/Daemons
@@ -159,26 +160,30 @@
 	%{?with_srp:USE_SRP=y} \
 	DESTDIR=$RPM_BUILD_ROOT%{_prefix}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pon
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poff
-install debian/plog $RPM_BUILD_ROOT%{_bindir}
-
-install etc.ppp/chap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
-install debian/pap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
-install debian/options $RPM_BUILD_ROOT%{_sysconfdir}/ppp
-install debian/options.ttyXX $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pon
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poff
+install -p debian/plog $RPM_BUILD_ROOT%{_bindir}
+
+cp -p etc.ppp/chap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/pap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/options $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/options.ttyXX $RPM_BUILD_ROOT%{_sysconfdir}/ppp
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ppp-non-english-man-pages
 
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
 > $RPM_BUILD_ROOT/var/log/ppp.log
 
 rm -f scripts/README
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
 
 cd $RPM_BUILD_ROOT%{_libdir}/pppd
-ln -s %{version}* plugins
+v=$(echo %{version}*)
+mv $v plugins
+# not sure which path used, keep the old path for compat
+ln -s plugins $v
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -198,18 +203,20 @@
 %attr(755,root,root) %{_sbindir}/pppstats
 %{?with_srp:%attr(755,root,root) %{_sbindir}/srp-entry}
 %dir %{_libdir}/pppd
-%dir %{_libdir}/pppd/%{version}
-%{_libdir}/pppd/plugins
-%attr(755,root,root) %{_libdir}/pppd/%{version}/minconn.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/openl2tp.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/pppol2tp.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/passprompt.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/passwordfd.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/rp-pppoe.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/radattr.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/radius.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/radrealms.so
-%attr(755,root,root) %{_libdir}/pppd/%{version}/winbind.so
+%dir %{_libdir}/pppd/plugins
+%attr(755,root,root) %{_libdir}/pppd/plugins/minconn.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/openl2tp.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppol2tp.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/passprompt.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/passwordfd.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/rp-pppoe.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radattr.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radius.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radrealms.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/winbind.so
+
+# TODO: legacy, try to drop
+%{_libdir}/pppd/%{version}
 
 %{_mandir}/man8/chat.8*
 %{_mandir}/man8/pppd.8*
@@ -238,7 +245,7 @@
 %if %{with pppoatm}
 %files plugin-pppoatm
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pppd/%{version}/pppoatm.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppoatm.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -247,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2012/04/02 08:47:41  glen
+- use %{_libdir}/pppd/plugins dir, add todo about versioned dir drop
+
 Revision 1.152  2011/01/29 00:07:13  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ppp/ppp.spec?r1=1.152&r2=1.153