packages: asterisk/asterisk.spec - licenses symlink, chown trigger

[glen]

Author: glen                         Date: Wed Dec 30 12:51:01 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- licenses symlink, chown trigger

---- Files affected:
packages/asterisk:
   asterisk.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.147 packages/asterisk/asterisk.spec:1.148
--- packages/asterisk/asterisk.spec:1.147	Wed Dec 30 12:53:25 2009
+++ packages/asterisk/asterisk.spec	Wed Dec 30 13:50:56 2009
@@ -17,7 +17,7 @@
 #   /usr/lib64/asterisk/modules/cdr_sqlite.so
 #   /usr/lib64/asterisk/modules/format_ilbc.so
 #   /usr/lib64/asterisk/modules/res_config_sqlite.so
-# - package for moh sound files
+# - make package for moh sound files
 #
 # Conditional build:
 %bcond_with	rxfax		# without rx (also tx:-D) fax
@@ -29,7 +29,7 @@
 %bcond_with	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.11
+%define		rel	0.17
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -625,6 +625,7 @@
 # create some directories that need to be packaged
 install -d $RPM_BUILD_ROOT%{_datadir}/asterisk/moh
 install -d $RPM_BUILD_ROOT%{_datadir}/asterisk/sounds
+install -d $RPM_BUILD_ROOT%{_datadir}/asterisk/licenses
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/asterisk
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/asterisk/cdr-custom
 install -d $RPM_BUILD_ROOT%{_localstatedir}/spool/asterisk/festival
@@ -632,6 +633,9 @@
 install -d $RPM_BUILD_ROOT%{_localstatedir}/spool/asterisk/outgoing
 install -d $RPM_BUILD_ROOT%{_localstatedir}/spool/asterisk/uploads
 
+# upstream prebuilt binaries (register, benchg729) use /var location
+ln -s %{_datadir}/asterisk/licenses $RPM_BUILD_ROOT%{_localstatedir}/lib/asterisk
+
 # We're not going to package any of the sample AGI scripts
 rm -f $RPM_BUILD_ROOT%{_datadir}/asterisk/agi-bin/*
 
@@ -658,8 +662,8 @@
 
 %postun
 if [ "$1" = 0 ]; then
-	%groupremove asterisk
 	%userremove asterisk
+	%groupremove asterisk
 fi
 
 %pre dahdi
@@ -679,6 +683,13 @@
 	/sbin/chkconfig --del asterisk
 fi
 
+%triggerpostun -- %{name} < 1.6.1.12-0.1
+# chown to asterisk previously root owned files
+# loose one (not one that cames from rpm), as we're not trying to split the
+# hair with file permission bits.
+chown -R asterisk:asterisk /var/spool/asterisk
+chown -R asterisk:asterisk /var/lib/asterisk
+
 %files
 %defattr(644,root,root,755)
 %doc README* *.txt ChangeLog BUGS CREDITS configs
@@ -914,13 +925,16 @@
 %dir %{_datadir}/asterisk/images
 %dir %{_datadir}/asterisk/moh
 %dir %{_datadir}/asterisk/sounds
+%dir %attr(750,root,asterisk) %{_datadir}/asterisk/licenses
 %dir %attr(750,root,asterisk) %{_datadir}/asterisk/keys
+# no need to protect publicly downloaded and packaged .pub
 %{_datadir}/asterisk/keys/*.pub
 %{_datadir}/asterisk/images/*.jpg
 %{_datadir}/asterisk/static-http
 %{_datadir}/asterisk/phoneprov
 
 %attr(770,root,asterisk) %dir %{_localstatedir}/lib/asterisk
+%{_localstatedir}/lib/asterisk/licenses
 
 %attr(770,root,asterisk) %dir %{_localstatedir}/log/asterisk
 %attr(770,root,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
@@ -1136,6 +1150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2009/12/30 12:50:56  glen
+- licenses symlink, chown trigger
+
 Revision 1.147  2009/12/30 11:53:25  glen
 - more packaging fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.147&r2=1.148&f=u