SPECS: php.spec - fresh use rpmbuild macros; rel 4

glen glen at pld-linux.org
Tue Sep 13 22:45:30 CEST 2005


Author: glen                         Date: Tue Sep 13 20:45:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fresh use rpmbuild macros; rel 4

---- Files affected:
SPECS:
   php.spec (1.474 -> 1.475) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.474 SPECS/php.spec:1.475
--- SPECS/php.spec:1.474	Tue Sep 13 21:52:24 2005
+++ SPECS/php.spec	Tue Sep 13 22:45:25 2005
@@ -78,7 +78,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-Release:	3.2%{?with_hardening:hardened}
+Release:	4%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
@@ -185,7 +185,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}
@@ -209,10 +209,6 @@
 
 # redefine to use versions from current source
 %define		__php_includedir %{_builddir}/%{name}-%{version}
-# these will be moved to rpm.macros later on.
-%define		php_api_version %(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h 2>/dev/null || echo ERROR)
-%define		zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
-%define		zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -371,6 +367,7 @@
 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}
@@ -2922,6 +2919,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.475  2005/09/13 20:45:25  glen
+- fresh use rpmbuild macros; rel 4
+
 Revision 1.474  2005/09/13 19:52:24  glen
 - make it parse spec properly if source is not yet unpacked to extract API versions
 
================================================================

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




More information about the pld-cvs-commit mailing list