Author: glen Date: Sat Nov 5 16:35:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- provide versions for fileinfo,phar,zip,json extensions. obsolete pecl package
if older; rel 10
---- Files affected:
packages/php:
php.spec (1.962 -> 1.963)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.962 packages/php/php.spec:1.963
--- packages/php/php.spec:1.962 Thu Nov 3 06:28:11 2011
+++ packages/php/php.spec Sat Nov 5 17:35:52 2011
@@ -111,7 +111,7 @@
%undefine with_filter
%endif
-%define rel 9
+%define rel 10
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -292,6 +292,12 @@
%define zend_module_api 20090626
%define zend_extension_api 220090626
+# Extension versions
+%define fileinfover 1.0.5-dev
+%define pharver 2.0.1
+%define zipver 1.9.1
+%define jsonver 1.2.1
+
%define zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
@@ -712,9 +718,9 @@
URL: http://www.php.net/manual/en/book.fileinfo.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
-Provides: php(fileinfo)
+Provides: php(fileinfo) = %{fileinfover}
Obsoletes: php-mime_magic
-Obsoletes: php-pecl-fileinfo
+Obsoletes: php-pecl-fileinfo < %{fileinfover}
%description fileinfo
This extension allows retrieval of information regarding vast majority
@@ -924,8 +930,8 @@
Group: Libraries
URL: http://www.php.net/manual/en/book.json.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(json)
-Obsoletes: php-pecl-json
+Provides: php(json) = %{jsonver}
+Obsoletes: php-pecl-json < %{jsonver}
%description json
php-json is an extremely fast PHP C extension for JSON (JavaScript
@@ -1333,7 +1339,8 @@
# zlib is required by phar program, but as phar cli is optional should the dep
be too
Suggests: %{name}-zlib
Suggests: php-program
-Provides: php(phar)
+Provides: php(phar) = %{pharver}
+Obsoletes: php-pecl-phar < %{pharver}
%description phar
This is a dynamic shared object (DSO) for PHP that will add phar
@@ -1799,8 +1806,8 @@
URL: http://www.php.net/manual/en/book.zip.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%{?with_system_libzip:Requires: libzip >= 0.10-3}
-Provides: php(zip)
-Obsoletes: php-pecl-zip
+Provides: php(zip) = %{zipver}
+Obsoletes: php-pecl-zip < %{zipver}
%description zip
Zip is an extension to create, modify and read zip files.
@@ -1963,6 +1970,32 @@
exit 1
fi
+# Check for some extension version
+ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}'
ext/fileinfo/php_fileinfo.h)
+if test "$ver" != "%{fileinfover}"; then
+ : Error: Upstream FILEINFO version is now ${ver}, expecting
%{fileinfover}.
+ : Update the fileinfover macro and rebuild.
+ exit 1
+fi
+ver=$(sed -n '/#define PHP_PHAR_VERSION /{s/.* "//;s/".*$//;p}'
ext/phar/php_phar.h)
+if test "$ver" != "%{pharver}"; then
+ : Error: Upstream PHAR version is now ${ver}, expecting %{pharver}.
+ : Update the pharver macro and rebuild.
+ exit 1
+fi
+ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}'
ext/zip/php_zip.h)
+if test "$ver" != "%{zipver}"; then
+ : Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
+ : Update the zipver macro and rebuild.
+ exit 1
+fi
+ver=$(sed -n '/#define PHP_JSON_VERSION /{s/.* "//;s/".*$//;p}'
ext/json/php_json.h)
+if test "$ver" != "%{jsonver}"; then
+ : Error: Upstream JSON version is now ${ver}, expecting %{jsonver}.
+ : Update the jsonver macro and rebuild.
+ exit 1
+fi
+
export EXTENSION_DIR="%{php_extensiondir}"
# configure once (for faster debugging purposes)
if [ ! -f _built-conf ]; then
@@ -3219,6 +3252,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.963 2011/11/05 16:35:52 glen
+- provide versions for fileinfo,phar,zip,json extensions. obsolete pecl
package if older; rel 10
+
Revision 1.962 2011/11/03 05:28:11 glen
- doh, don't just REVERT it, bcond it!
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.962&r2=1.963&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
