X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=4a80cbac51116b2572d6e0c5c411b253e38fc526;hb=c2e4bded52dd1118cd759b0983e6fc6f9eb3232c;hp=eba6e41ffc427dd784255aa159f763558bc40dca;hpb=41a74309ca032e8d4ac0116f64d6b710375ea476;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index eba6e41..4a80cba 100644
--- a/php.spec
+++ b/php.spec
@@ -142,8 +142,8 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.0.25
-Release:	1
+Version:	7.0.31
+Release:	3
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -151,7 +151,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	93e84a3997a411edd27abd3f148f6794
+# Source0-md5:	3c715583db72233ff37234f5c531a8ef
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -294,13 +294,13 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # Extension versions
 %define		bz2ver		1.0
-%define		enchantver	1.1.0
+%define		enchantver	%{version}
 %define		fileinfover	1.0.5
 %define		hashver		1.0
 %define		intlver		1.1.0
 %define		jsonver		1.4.0
 %define		pharver		2.0.2
-%define		sqlite3ver	0.7-dev
+%define		sqlite3ver	%{version}
 %define		zipver		1.13.5
 %define		phpdbgver	0.5.0
 
@@ -2111,8 +2111,6 @@ if test "$ver" != "%{pharver}"; then
 fi
 ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
 if test "$ver" != "PHP_VERSION"; then
-	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
-	: Update the sqlite3ver macro and rebuild.
 	exit 1
 fi
 ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
@@ -2139,10 +2137,8 @@ if test "$ver" != "%{bz2ver}"; then
 	: Update the bz2ver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_ENCHANT_VERSION /{s/.* "//;s/".*$//;p}' ext/enchant/php_enchant.h)
-if test "$ver" != "%{enchantver}"; then
-	: Error: Upstream Enchant version is now ${ver}, expecting %{enchantver}.
-	: Update the enchantver macro and rebuild.
+ver=$(awk '/#define PHP_ENCHANT_VERSION/ {print $3}' ext/enchant/php_enchant.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	exit 1
 fi
 ver=$(awk '/#define PHP_HASH_VERSION/ {print $3}' ext/hash/php_hash.h | xargs)
@@ -2586,6 +2582,7 @@ cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/
 %endif
 
 # CLI
+libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php%{php_suffix}
 # touch for ghost
 touch $RPM_BUILD_ROOT%{_bindir}/php
 touch $RPM_BUILD_ROOT%{_mandir}/man1/php.1
@@ -2665,9 +2662,12 @@ update-alternatives \
 
 %postun cli
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove php %{_bindir}/php || :
+	update-alternatives --remove php %{_bindir}/php%{php_suffix} || :
 fi
 
+%post	common -p /sbin/ldconfig
+%postun	common -p /sbin/ldconfig
+
 %post devel
 update-alternatives \
 	--install %{_bindir}/phpize phpize %{_bindir}/phpize%{php_suffix} %{php_suffix} \
@@ -2678,8 +2678,8 @@ update-alternatives \
 
 %postun devel
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove phpize %{_bindir}/phpize || :
-	update-alternatives --remove php-config %{_bindir}/php-config || :
+	update-alternatives --remove phpize %{_bindir}/phpize%{php_suffix} || :
+	update-alternatives --remove php-config %{_bindir}/php-config%{php_suffix} || :
 fi
 
 %pre fpm
@@ -2694,7 +2694,7 @@ update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_s
 if [ "$1" = "0" ]; then
 	%service %{name}-fpm stop
 	/sbin/chkconfig --del %{name}-fpm
-	update-alternatives --remove php-fpm %{_sbindir}/php-fpm || :
+	update-alternatives --remove php-fpm %{_sbindir}/php%{php_suffix}-fpm || :
 fi
 
 %postun fpm
@@ -2857,7 +2857,7 @@ update-alternatives \
 %postun phar
 %ext_postun
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove phar %{_bindir}/phar || :
+	update-alternatives --remove phar %{_bindir}/phar%{php_suffix}.phar || :
 fi
 
 %if %{with apache2}