packages: asterisk/asterisk.spec - write licenses to /var/lib/licenses, kee...

[glen]

Author: glen                         Date: Thu Jan  7 14:50:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- write licenses to /var/lib/licenses, keep symlink in datadir

---- Files affected:
packages/asterisk:
   asterisk.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.160 packages/asterisk/asterisk.spec:1.161
--- packages/asterisk/asterisk.spec:1.160	Mon Jan  4 18:46:35 2010
+++ packages/asterisk/asterisk.spec	Thu Jan  7 15:49:59 2010
@@ -32,7 +32,7 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.42
+%define		rel	0.44
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -717,17 +717,15 @@
 # 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
+ln -s %{_localstatedir}/lib/asterisk/licenses $RPM_BUILD_ROOT%{_datadir}/asterisk/licenses
+
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/asterisk/licenses
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/asterisk/cdr-custom
 install -d $RPM_BUILD_ROOT%{_localstatedir}/spool/asterisk/festival
 install -d $RPM_BUILD_ROOT%{_localstatedir}/spool/asterisk/monitor
 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/*
 
@@ -1010,15 +1008,15 @@
 %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/phoneprov
+%{_datadir}/asterisk/licenses
 
 %attr(770,root,asterisk) %dir %{_localstatedir}/lib/asterisk
-%{_localstatedir}/lib/asterisk/licenses
+%dir %attr(750,root,asterisk) %{_localstatedir}/lib/asterisk/licenses
 
 %attr(770,root,asterisk) %dir %{_localstatedir}/log/asterisk
 %attr(770,root,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
@@ -1282,6 +1280,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2010/01/07 14:49:59  glen
+- write licenses to /var/lib/licenses, keep symlink in datadir
+
 Revision 1.160  2010/01/04 17:46:35  glen
 - astman,gsm,http,lpc10,resample,speex,vorbis subpackages
 
================================================================

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