SPECS (AC-branch): php4.spec - move icons to /usr/share/apache-ico...

[glen]

Author: glen                         Date: Sat Feb 23 19:36:04 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- move icons to /usr/share/apache-icons
- rel 7

---- Files affected:
SPECS:
   php4.spec (1.576.2.24 -> 1.576.2.25) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.576.2.24 SPECS/php4.spec:1.576.2.25
--- SPECS/php4.spec:1.576.2.24	Thu Feb 21 20:02:50 2008
+++ SPECS/php4.spec	Sat Feb 23 20:35:58 2008
@@ -73,7 +73,7 @@
 %undefine	with_msession
 %endif
 
-%define		rel 6
+%define		rel 7
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -1813,7 +1813,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}} \
-	$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
+	$RPM_BUILD_ROOT%{_datadir}/apache-icons \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
 	$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/conf.d} \
 	$RPM_BUILD_ROOT%{_mandir}/man1
@@ -1866,13 +1866,13 @@
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
 
 %if %{with apache1}
-install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons
+install %{SOURCE2} php.gif $RPM_BUILD_ROOT%{_datadir}/apache-icons
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php4.conf
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
 %endif
 
 %if %{with apache2}
-install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons
+install %{SOURCE2} php.gif $RPM_BUILD_ROOT%{_datadir}/apache-icons
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php4.conf
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
 %endif
@@ -2587,7 +2587,7 @@
 %dir %{_sysconfdir}/apache.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
 %attr(755,root,root) %{_libdir}/apache1/libphp4.so
-/home/services/apache/icons/*
+%{_datadir}/apache-icons/*
 %endif
 
 %if %{with apache2}
@@ -2598,7 +2598,7 @@
 %dir %{_sysconfdir}/apache2handler.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
 %attr(755,root,root) %{_libdir}/apache/libphp4.so
-/home/services/httpd/icons/*
+%{_datadir}/apache-icons/*
 %endif
 
 %if %{with fcgi}
@@ -3136,6 +3136,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.576.2.25  2008-02-23 19:35:58  glen
+- move icons to /usr/share/apache-icons
+- rel 7
+
 Revision 1.576.2.24  2008-02-21 19:02:50  glen
 - release 6 (rebuild)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4.spec?r1=1.576.2.24&r2=1.576.2.25&f=u