SPECS (DEVEL): php.spec - merge from HEAD: added /usr/share/php to...

[glen]

Author: glen                         Date: Tue Sep 13 20:48:05 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- merge from HEAD: added /usr/share/php to package; add php/zend version api provides

---- Files affected:
SPECS:
   php.spec (1.467.2.9 -> 1.467.2.10) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.467.2.9 SPECS/php.spec:1.467.2.10
--- SPECS/php.spec:1.467.2.9	Sat Sep 10 22:23:16 2005
+++ SPECS/php.spec	Tue Sep 13 22:47:59 2005
@@ -179,7 +179,7 @@
 %{?with_recode:BuildRequires:	recode-devel >= 3.5d-3}
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-php-pearprov >= 4.0.2-100
-BuildRequires:	rpmbuild(macros) >= 1.230
+BuildRequires:	rpmbuild(macros) >= 1.238
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 BuildRequires:	t1lib-devel
 %{?with_tidy:BuildRequires:	tidy-devel}
@@ -198,8 +198,12 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/php
+%define		_phpsharedir	%{_datadir}/php
 %define		extensionsdir	%{_libdir}/php
 
+# redefine to use versions from current source
+%define		__php_includedir %{_builddir}/%{name}-%{version}
+
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
 easy for developers to write dynamically generated web pages. PHP also
@@ -357,7 +361,11 @@
 Requires:	glibc >= 6:2.3.5
 Requires:	sed >= 4.0
 Provides:	%{name}-session = %{epoch}:%{version}-%{release}
+# FIXME: apache2 specific Provides
 Provides:	php-common(apache-modules-api) = %{apache_modules_api}
+Provides:	php(modules_api) = %{php_api_version}
+Provides:	php(zend_module_api) = %{zend_module_api}
+Provides:	php(zend_extension_api) = %{zend_extension_api}
 Obsoletes:	php-session < 3:4.2.1-2
 # for the posttrans scriptlet, conflicts because in vserver enviroinment rpm package is not installed.
 Conflicts:	rpm < 4.4.2-0.2
@@ -1432,8 +1440,10 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
+# IMPORTANT: if you change '%setup', you should change %__php_includedir macro earlier in this file
 %setup -q -n %{name}-%{version}%{_rc}
 # this patch is broken by design, breaks --enable-versioning for example
+# update: --enable-version is broken by itself, it disables dynamic modules.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1694,7 +1704,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
+install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}} \
 	$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
 	$RPM_BUILD_ROOT/var/run/php \
@@ -2507,6 +2517,7 @@
 %attr(755,root,root) %{_sbindir}/php-module-install
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
 %dir %{extensionsdir}
+%dir %{_phpsharedir}
 
 %files devel
 %defattr(644,root,root,755)
@@ -2909,11 +2920,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.467.2.10  2005/09/13 20:47:59  glen
+- merge from HEAD: added /usr/share/php to package; add php/zend version api provides
+
 Revision 1.467.2.9  2005/09/10 20:23:16  arekm
 - drop seding phpize and instead fix that in builddir.patch
 
 Revision 1.467.2.8  2005/09/03 14:02:13  arekm
-BR pcre-devel
+- BR pcre-devel
 
 Revision 1.467.2.7  2005/09/03 10:50:16  arekm
 - link with system pcre library, not bundled one
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.9&r2=1.467.2.10&f=u