update backport patch to 20130717, include it in release number

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 31f54812d5341deac2db324089e0f85c0e79a9b4..a786f48faabf4097c7705ed229d90bbe47b0bb8e 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -108,10 +108,13 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                orgname php
 %if "%{pld_release}" == "th"
 %define                php_suffix 52
+%define                _noautoreqdep libphp_common.*
 %else
 %define                php_suffix %{nil}
 %endif
 
+%define        rel             1
+%define        backport_date   20130717
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -120,7 +123,7 @@ Summary(ru.UTF-8):  PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       5.2.17
-Release:       33
+Release:       %{backport_date}.%{rel}
 Epoch:         4
 License:       PHP
 Group:         Libraries
@@ -141,8 +144,8 @@ Source11:   %{orgname}-fpm.logrotate
 Source12:      %{orgname}-branch.sh
 Source13:      dep-tests.sh
 Source14:      skip-tests.sh
-Patch100:      https://php52-backports.googlecode.com/files/php52-backports-20130320.patch
-# Patch100-md5:        8428acfb94d5804e00333db01f7cd8dd
+Patch100:      https://php52-backports.googlecode.com/files/php52-backports-%{backport_date}.patch
+# Patch100-md5:        80014a8f7894d4e893a8b1292b8b3032
 Patch0:                %{orgname}-shared.patch
 Patch1:                %{orgname}-pldlogo.patch
 Patch2:                %{orgname}-mail.patch
@@ -207,7 +210,6 @@ Patch60:    bug-60986.patch
 Patch65:       system-libzip.patch
 Patch66:       bug-47930.patch
 Patch67:       php-db.patch
-Patch68:       php-libxml.patch
 Patch69:       bug-50563.patch
 Patch70:       php-crypt-null.patch
 Patch71:       php-apache24.patch
@@ -495,6 +497,18 @@ Requires:  glibc >= 6:2.3.5
 Requires:      php-dirs >= 1.4
 Requires:      rpm-whiteout >= 1.28
 Requires:      tzdata
+Provides:      %{name}(debug) = %{php_debug}
+Provides:      %{name}(modules_api) = %{php_api_version}
+Provides:      %{name}(thread-safety) = %{zend_zts}
+Provides:      %{name}(zend_extension_api) = %{zend_extension_api}
+Provides:      %{name}(zend_module_api) = %{zend_module_api}
+Provides:      %{name}-core
+Provides:      %{name}-date
+Provides:      %{name}-ereg
+%{?with_zend_multibyte:Provides:       %{name}-mbstring = %{epoch}:%{version}-%{release}}
+Provides:      %{name}-overload
+Provides:      %{name}-reflection
+Provides:      %{name}-standard
 Provides:      php(core) = %{version}
 Provides:      php(date)
 Provides:      php(ereg)
@@ -504,17 +518,6 @@ Provides:  php(modules_api) = %{php_api_version}
 Provides:      php(overload)
 Provides:      php(reflection)
 Provides:      php(standard)
-Provides:      php(zend_extension_api) = %{zend_extension_api}
-Provides:      php(zend_module_api) = %{zend_module_api}
-Provides:      php-core
-Provides:      php-date
-Provides:      php-ereg
-%{?with_zend_multibyte:Provides:       php-mbstring = %{epoch}:%{version}-%{release}}
-Provides:      php-overload
-Provides:      php-reflection
-Provides:      php-standard
-Provides:      php5(debug) = %{php_debug}
-Provides:      php5(thread-safety) = %{zend_zts}
 # ensure backward compatibility for Titanium
 # to be dropped in future but ask Titanium RM before doing so
 %if "%{pld_release}" == "ti"
@@ -527,6 +530,8 @@ Requires:   %{name}-pcre = %{epoch}:%{version}-%{release}
 Requires:      %{name}-session = %{epoch}:%{version}-%{release}
 Requires:      %{name}-spl = %{epoch}:%{version}-%{release}
 %endif
+%{!?with_mysqlnd:Obsoletes:    php-mysqlnd}
+%{?with_pcre:%requires_ge_to   pcre pcre-devel}
 Obsoletes:     php-pecl-domxml
 Conflicts:     php-pecl-memcache < 3.0.4-2
 Conflicts:     php4-common < 3:4.4.4-8
@@ -624,9 +629,9 @@ Summary(pl.UTF-8):  Moduł bzip2 dla PHP
 Group:         Libraries
 URL:           http://www.php.net/manual/en/book.bzip2.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Provides:      %{name}-bzip2 = %{epoch}:%{version}-%{release}
 Provides:      php(bz2)
 Provides:      php(bzip2)
-Provides:      php-bzip2 = %{epoch}:%{version}-%{release}
 Obsoletes:     php-bzip2
 
 %description bz2
@@ -719,8 +724,8 @@ URL:                http://www.php.net/manual/en/book.dom.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(dom)
 # it has some compatibility functions
+Provides:      %{name}-domxml = %{epoch}:%{version}-%{release}
 Provides:      php(domxml)
-Provides:      php-domxml = %{epoch}:%{version}-%{release}
 Obsoletes:     php-domxml <= 3:4.3.8-1
 
 %description dom
@@ -1795,9 +1800,9 @@ Summary(pl.UTF-8):        Zarządzanie archiwami zip
 Group:         Libraries
 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
-%{?with_system_libzip:Requires:        libzip >= 0.10-3}
 
 %description zip
 Zip is an extension to create, modify and read zip files.
@@ -1918,7 +1923,6 @@ done
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p2
 %patch67 -p1
-%patch68 -p1
 %patch69 -p4
 %patch70 -p1
 %patch71 -p1
@@ -2289,18 +2293,21 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cg
 %{__make} install-headers install-build install-modules install-programs \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
+# version suffix
+v=$(echo %{version} | cut -d. -f1-2)
+
 # install Apache1 DSO module
 %if %{with apache1}
-libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
-mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-%{version}}.so
-ln -s libphp5-%{version}.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so
+libtool --mode=install install -p sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
+mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-$v}.so
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so
 %endif
 
 # install Apache2 DSO module
 %if %{with apache2}
-libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
-mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-%{version}}.so
-ln -s libphp5-%{version}.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so
+libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
+mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-$v}.so
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so
 %endif
 
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
@@ -2561,7 +2568,7 @@ fi
 %dir %{_sysconfdir}/apache.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
 %attr(755,root,root) %{_libdir}/apache1/libphp5.so
-%attr(755,root,root) %{_libdir}/apache1/libphp5-%{version}.so
+%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so
 %endif
 
 %if %{with apache2}
@@ -2571,7 +2578,7 @@ fi
 %dir %{_sysconfdir}/apache2handler.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
 %attr(755,root,root) %{_libdir}/apache/libphp5.so
-%attr(755,root,root) %{_libdir}/apache/libphp5-%{version}.so
+%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so
 %endif
 
 %if %{with fcgi}