SPECS: php4.spec - common dirs moved to php-dirs package, rel 9

[glen]

Author: glen                         Date: Thu Mar 23 19:10:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- common dirs moved to php-dirs package, rel 9

---- Files affected:
SPECS:
   php4.spec (1.527 -> 1.528) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.527 SPECS/php4.spec:1.528
--- SPECS/php4.spec:1.527	Wed Jan 25 22:57:23 2006
+++ SPECS/php4.spec	Thu Mar 23 20:10:04 2006
@@ -5,7 +5,6 @@
 #
 # TODO:
 # - make additional headers added by mail patch configurable
-# - /var/run/php group not owned
 #11:26:36 <@glen> php4-common-4.4.0-14 marks heimdal-libs-0.7.1-1 (cap heimdal-libs)
 #11:26:36 <@glen>   heimdal-libs-0.7.1-1 marks openldap-libs-2.2.29-1 (cap liblber-2.2.so.7()(64bit))
 #11:26:36 <@glen>     openldap-libs-2.2.29-1 marks cyrus-sasl-2.1.21-3 (cap cyrus-sasl)
@@ -21,7 +20,6 @@
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	oracle		# with oracle extension module		(BR: proprietary libs)
 %bcond_without	cpdf		# without cpdf extension module
-%bcond_without	curl		# without CURL extension module
 %bcond_without	domxslt		# without DOM XSLT/EXSLT support in DOM XML extension module
 %bcond_without	fribidi		# without FriBiDi extension module
 %bcond_without	imap		# without IMAP extension module
@@ -54,6 +52,7 @@
 %bcond_without	zts		# disable experimental-zts
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
+%bcond_without	curl		# without CURL extension module
 
 # mm is not thread safe
 # ext/session/mod_mm.c:37:3: #error mm is not thread-safe
@@ -78,7 +77,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.4.2
-%define	_rel 8
+%define	_rel 9
 Release:	%{_rel}%{?with_hardening:hardened}
 Epoch:		3
 License:	PHP
@@ -220,7 +219,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/php4
-%define		_phpsharedir	%{_datadir}/php
 %define		extensionsdir	%{_libdir}/php4
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
@@ -399,6 +397,7 @@
 Group:		Libraries
 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
 Requires:	glibc >= 6:2.3.5
+Requires:	php-dirs
 Requires:	sed >= 4.0
 Provides:	%{name}-openssl = %{epoch}:%{version}-%{release}
 Provides:	%{name}-session = %{epoch}:%{version}-%{release}
@@ -1901,10 +1900,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}} \
+install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
 	$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
-	$RPM_BUILD_ROOT/var/run/php \
 	$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/httpd.conf} \
 	$RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -2752,11 +2750,9 @@
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%attr(770,root,http) %dir %verify(not group mode) /var/run/php
 %attr(755,root,root) %{_sbindir}/php4-module-install
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
 %dir %{extensionsdir}
-%dir %{_phpsharedir}
 
 %files devel
 %defattr(644,root,root,755)
@@ -3250,6 +3246,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.528  2006/03/23 19:10:04  glen
+- common dirs moved to php-dirs package, rel 9
+
 Revision 1.527  2006/01/25 21:57:23  arekm
 - rel 8; see cvs log php-openssl-huge-hack.patch for details
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.527&r2=1.528&f=u