packages: ldap-account-manager/ldap-account-manager.spec - moved daemon to ...

[baggins]

Author: baggins                      Date: Sat Feb 13 17:27:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved daemon to sbindir
- moved/linked sess and tmp dirs to /var...

---- Files affected:
packages/ldap-account-manager:
   ldap-account-manager.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/ldap-account-manager/ldap-account-manager.spec
diff -u packages/ldap-account-manager/ldap-account-manager.spec:1.27 packages/ldap-account-manager/ldap-account-manager.spec:1.28
--- packages/ldap-account-manager/ldap-account-manager.spec:1.27	Thu Feb  4 12:44:11 2010
+++ packages/ldap-account-manager/ldap-account-manager.spec	Sat Feb 13 18:27:07 2010
@@ -141,10 +141,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_phpdocdir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_phpdocdir}/%{name}} \
+	$RPM_BUILD_ROOT{/var/lib/%{name}/{sess,tmp},%{_sbindir}}
 
 cp -a . $RPM_BUILD_ROOT%{_appdir}
 
+# daemon
+mv $RPM_BUILD_ROOT%{_appdir}/lib/lamdaemon.pl $RPM_BUILD_ROOT%{_sbindir}
+
 # config
 mv $RPM_BUILD_ROOT{%{_appdir}/config/*,%{_sysconfdir}}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -158,6 +162,10 @@
 # in %doc
 rm $RPM_BUILD_ROOT%{_appdir}/{HISTORY,README,VERSION,copyright}
 
+rm -rf $RPM_BUILD_ROOT%{_appdir}/{sess,tmp}
+ln -s /var/lib/%{name}/sess $RPM_BUILD_ROOT%{_appdir}/sess
+ln -s /var/lib/%{name}/tmp $RPM_BUILD_ROOT%{_appdir}/tmp
+
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
@@ -226,16 +234,15 @@
 %lang(zh_CN) %{_appdir}/locale/zh_CN
 %lang(zh_TW) %{_appdir}/locale/zh_TW
 
-# XXX: move out of lam topdir
-%exclude %{_appdir}/lib/lamdaemon.pl
-
-# XXX: use /var
-%dir %attr(740,http,http) %{_appdir}/sess
-%dir %attr(740,http,http) %{_appdir}/tmp
+# symlinks to /var/lib/...
+%{_appdir}/sess
+%{_appdir}/tmp
+%dir %attr(740,http,http) /var/lib/%{name}/sess
+%dir %attr(740,http,http) /var/lib/%{name}/tmp
 
 %files lamdaemon
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_appdir}/lib/lamdaemon.pl
+%attr(755,root,root) %{_sbindir}/lamdaemon.pl
 
 %files phpdoc
 %defattr(644,root,root,755)
@@ -247,6 +254,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/02/13 17:27:07  baggins
+- moved daemon to sbindir
+- moved/linked sess and tmp dirs to /var...
+
 Revision 1.27  2010/02/04 11:44:11  baggins
 - updated docs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ldap-account-manager/ldap-account-manager.spec?r1=1.27&r2=1.28&f=u