X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=954fd29b25cb7e89a4ad8cf8b4c13310e46d0c5f;hb=refs%2Fheads%2FPHP_7_0;hp=aaff873e174bd9ef52221173c9fd7b9734498c27;hpb=dccfdb642699a3ed67e7237de27992afdee1f86d;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index aaff873..954fd29 100644
--- a/php.spec
+++ b/php.spec
@@ -24,20 +24,13 @@
 # standard
 #
 # Conditional build:
-%bcond_without	default_php	# use this PHP as default PHP in distro
 # - General options:
 %bcond_without	embed		# disable building Embedded API
 %bcond_with	gcov		# Enable Code coverage reporting
-%bcond_without	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
-%bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_without	kerberos5	# without Kerberos5 support
-%bcond_with	mm		# without mm support for session storage
 %bcond_with	suhosin		# with suhosin patch, has little point in PHP>=5.3, see https://github.com/stefanesser/suhosin/issues/42#issuecomment-41728178
-%bcond_with	system_gd	# with system gd (imageantialias function is missing then)
-%bcond_with	system_libzip	# with system libzip (reported broken currently)
 %bcond_with	systemtap	# systemtap/DTrace support
 %bcond_with	tests		# default off; test process very often hangs on builders, approx run time 45m; perform "make test"
-%bcond_without	webp		# Without WebP support in GD extension (imagecreatefromwebp)
 %bcond_with	zts		# Zend Thread Safety
 # - SAPI
 %bcond_without	apache2		# disable building Apache 2.x SAPI
@@ -55,7 +48,6 @@
 %bcond_without	dba		# without DBA extension module
 %bcond_without	dom		# without DOM extension module
 %bcond_without	enchant		# without Enchant extension module
-%bcond_without	ereg		# without ext/ereg support
 %bcond_without	exif		# without EXIF extension module
 %bcond_without	fileinfo	# without fileinfo extension module
 %bcond_without	filter		# without filter extension module
@@ -98,6 +90,13 @@
 %bcond_without	tidy		# without Tidy extension module
 %bcond_without	wddx		# without WDDX extension module
 %bcond_without	xmlrpc		# without XML-RPC extension module
+# extensions options
+%bcond_without	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
+%bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
+%bcond_with	mm		# without mm support for session storage
+%bcond_with	system_gd	# with system gd (imageantialias function is missing then)
+%bcond_with	system_libzip	# with system libzip (reported broken currently)
+%bcond_without	webp		# Without WebP support in GD extension (imagecreatefromwebp)
 
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
@@ -135,8 +134,7 @@
 %endif
 
 %define		orgname	php
-%define		ver_suffix 70
-%define		php_suffix %{!?with_default_php:%{ver_suffix}}
+%define		php_suffix 70
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -144,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.2
-Release:	0.1
+Version:	7.0.33
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -153,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:	ce5964672e4ec0b66ff088a6bafde8c7
+# Source0-md5:	a6d7c355d023301a1a9ec8b4f32a4856
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -165,8 +163,8 @@ Source13:	dep-tests.sh
 Source14:	skip-tests.sh
 Patch0:		%{orgname}-shared.patch
 Patch1:		%{orgname}-tld.patch
-Patch2:		%{orgname}-mail.patch
 Patch3:		%{orgname}-link-libs.patch
+Patch4:		intl-stdc++.patch
 Patch5:		%{orgname}-filter-shared.patch
 Patch6:		%{orgname}-build_modules.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
@@ -179,7 +177,7 @@ Patch17:	%{orgname}-readline.patch
 Patch18:	%{orgname}-nohttpd.patch
 Patch21:	%{orgname}-dba-link.patch
 Patch22:	%{orgname}-both-apxs.patch
-Patch23:	%{orgname}-builddir.patch
+Patch23:	%{orgname}-paths.patch
 Patch24:	%{orgname}-zlib-for-getimagesize.patch
 Patch25:	%{orgname}-stupidapache_version.patch
 Patch26:	%{orgname}-pear.patch
@@ -194,8 +192,6 @@ Patch41:	%{orgname}-fpm-config.patch
 Patch42:	%{orgname}-fpm-shared.patch
 Patch43:	%{orgname}-silent-session-cleanup.patch
 Patch44:	%{orgname}-include_path.patch
-Patch45:	%{orgname}-imap-annotations.patch
-Patch46:	%{orgname}-imap-myrights.patch
 Patch47:	suhosin.patch
 Patch50:	extension-shared-optional-dep.patch
 Patch51:	spl-shared.patch
@@ -203,25 +199,23 @@ Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
 Patch55:	bug-52078-fileinode.patch
 Patch59:	%{orgname}-systzdata.patch
-Patch60:	%{orgname}-oracle-instantclient.patch
 Patch62:	mcrypt-libs.patch
 Patch65:	system-libzip.patch
 Patch66:	php-db.patch
 Patch67:	mysql-lib-ver-mismatch.patch
-# https://bugs.php.net/bug.php?id=68344
-Patch68:	php-mysql-ssl-context.patch
+Patch69:	fpm-conf-split.patch
 Patch70:	mysqlnd-ssl.patch
 Patch71:	libdb-info.patch
 Patch72:	phar-hash-shared.patch
-URL:		http://www.php.net/
+URL:		http://php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.4d
 BuildRequires:	bison
-BuildRequires:	bzip2-devel
+BuildRequires:	bzip2-devel >= 1.0.0
 %{?with_curl:BuildRequires:	curl-devel >= 7.12.0}
-BuildRequires:	cyrus-sasl-devel
+BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
 %{?with_enchant:BuildRequires:	enchant-devel >= 1.1.3}
@@ -239,13 +233,14 @@ BuildRequires:	freetype-devel >= 1:2.5.1
 BuildRequires:	gd-devel >= 2.1
 %endif
 BuildRequires:	gdbm-devel
-BuildRequires:	gmp-devel
+BuildRequires:	gmp-devel >= 4.2
 %{?with_imap:BuildRequires:	imap-devel >= 1:2007e-2}
 %{?with_intl:BuildRequires:	libicu-devel >= 4.4}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
-BuildRequires:	libmcrypt-devel >= 2.4.4
+BuildRequires:	libmcrypt-devel >= 2.5.6
 BuildRequires:	libpng-devel >= 1.0.8
+%{?with_intl:BuildRequires:	libstdc++-devel}
 %{?with_webp:BuildRequires:	libwebp-devel}
 BuildRequires:	tokyocabinet-devel
 BuildRequires:	libtool >= 2:2.4.6
@@ -288,7 +283,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		php_sysconfdir		/etc/%{name}
 %define		php_extensiondir	%{_libdir}/%{name}
-%define		_sysconfdir			%{php_sysconfdir}
+%define		php_datadir		/usr/share/php/%{name}
+%define		_sysconfdir		%{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
 %define		php_api_version		20151012
@@ -298,15 +294,14 @@ 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		opcachever	7.0.6-dev
 %define		pharver		2.0.2
-%define		sqlite3ver	0.7-dev
-%define		zipver		1.13.0
+%define		sqlite3ver	%{version}
+%define		zipver		1.13.5
 %define		phpdbgver	0.5.0
 
 %define		_zend_zts		%{!?with_zts:0}%{?with_zts:1}
@@ -429,7 +424,7 @@ Summary:	PHP as CLI interpreter
 Summary(pl.UTF-8):	PHP jako interpreter działający z linii poleceń
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php-program
+Requires:	alternatives
 Obsoletes:	php-cli < 4:5.3.28-7
 
 %description cli
@@ -457,12 +452,14 @@ celu obsługi PHP jako języka skryptowego.
 Summary:	PHP FastCGI Process Manager
 Summary(pl.UTF-8):	PHP FastCGI Process Manager - zarządca procesów FastCGI
 Group:		Development/Languages/PHP
-URL:		http://www.php-fpm.org/
+URL:		http://php-fpm.org/
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	alternatives
+Requires:	php-dirs >= 1.4-2
 Requires:	rc-scripts
 Provides:	php(fcgi)
 Provides:	php(fpm)
@@ -479,6 +476,7 @@ PHP FastCGI Process Manager - zarządca procesów FastCGI.
 
 %package phpdbg
 Summary:	The debugging platform for PHP 5.4+
+Summary(pl.UTF-8):	Platforma diagnostyczna dla PHP 5.4+
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(phpdbg) = %{phpdbgver}
@@ -493,6 +491,15 @@ your code.
 phpdbg aims to be a lightweight, powerful, easy to use debugging
 platform for PHP 5.4+
 
+%description phpdbg -l pl.UTF-8
+phpdbg - interaktywny debugger dla PHP.
+
+Jest zaimplementowany jako moduł SAPI, potrafi przejąć pełną kontrolę
+nad środowiskiem bez wpływu na zachowanie lub wydajność kodu.
+
+Narzędzie powstało jako lekka, mająca duże możliwości, łatwa w użyciu
+platforma diagnostyczna dla PHP 5.4+.
+
 %package common
 Summary:	Common files needed by both Apache modules and CGI/CLI SAPIs
 Summary(pl.UTF-8):	Wspólne pliki dla modułu Apache'a i programu CGI
@@ -512,12 +519,10 @@ Provides:	%{name}(zend_extension_api) = %{zend_extension_api}
 Provides:	%{name}(zend_module_api) = %{zend_module_api}
 Provides:	%{name}-core
 Provides:	%{name}-date
-%{?with_ereg:Provides:	%{name}-ereg}
 Provides:	%{name}-reflection
 Provides:	%{name}-standard
 Provides:	php(core) = %{version}
 Provides:	php(date)
-%{?with_ereg:Provides:	php(ereg)}
 Provides:	php(libxml)
 Provides:	php(reflection)
 Provides:	php(standard)
@@ -525,7 +530,14 @@ Provides:	php(standard)
 %{?with_pcre:%requires_ge_to	pcre pcre-devel}
 Suggests:	browscap
 Obsoletes:	php-common < 4:5.3.28-7
+# withdrawn modules
+Obsoletes:	php-filepro < 4:5.2.0
+Obsoletes:	php-hwapi < 4:5.2.0
+Obsoletes:	php-hyperwave < 3:5.0.0
+Obsoletes:	php-java < 3:5.0.0
+Obsoletes:	php-mcal < 3:5.0.0
 Obsoletes:	php-pecl-domxml
+Obsoletes:	php-qtdom < 3:5.0.0
 Conflicts:	php4-common < 3:4.4.4-8
 Conflicts:	php55-common < 4:5.5.10-4
 Conflicts:	rpm < 4.4.2-0.2
@@ -558,14 +570,12 @@ Requires:	libtool >= 2:2.4.6
 %{?with_pcre:Requires:	pcre-devel >= 8.10}
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	php-devel
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 Obsoletes:	php52-devel
 Obsoletes:	php53-devel
 Obsoletes:	php54-devel
 Obsoletes:	php55-devel
-Obsoletes:	php56-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -604,7 +614,7 @@ oracle, встановіть цей пакет для компіляції ок
 Summary:	bcmath extension module for PHP
 Summary(pl.UTF-8):	Moduł bcmath dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.bc.php
+URL:		http://php.net/manual/en/book.bc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(bcmath)
 Obsoletes:	php-bcmath < 4:5.3.28-7
@@ -621,8 +631,9 @@ matematycznych takich jak w programie bc.
 Summary:	Bzip2 extension module for PHP
 Summary(pl.UTF-8):	Moduł bzip2 dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.bzip2.php
+URL:		http://php.net/manual/en/book.bzip2.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	bzip2-libs >= 1.0.0
 Provides:	php(bz2) = %{bz2ver}
 Provides:	php(bzip2)
 Provides:	php-bzip2 = %{epoch}:%{version}-%{release}
@@ -641,7 +652,7 @@ Moduł PHP umożliwiający używanie kompresji bzip2.
 Summary:	Calendar extension module for PHP
 Summary(pl.UTF-8):	Moduł funkcji kalendarza dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.calendar.php
+URL:		http://php.net/manual/en/book.calendar.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(calendar)
 Obsoletes:	php-calendar < 4:5.3.28-7
@@ -657,7 +668,7 @@ Moduł PHP dodający wsparcie dla kalendarza.
 Summary:	ctype extension module for PHP
 Summary(pl.UTF-8):	Moduł ctype dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.ctype.php
+URL:		http://php.net/manual/en/book.ctype.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(ctype)
 Obsoletes:	php-ctype < 4:5.3.28-7
@@ -673,8 +684,9 @@ Moduł PHP umożliwiający korzystanie z funkcji ctype.
 Summary:	curl extension module for PHP
 Summary(pl.UTF-8):	Moduł curl dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.curl.php
+URL:		http://php.net/manual/en/book.curl.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	curl-libs >= 7.12.0
 Provides:	php(curl)
 Obsoletes:	php-curl < 4:5.3.28-7
 
@@ -689,10 +701,12 @@ Moduł PHP umożliwiający korzystanie z biblioteki curl.
 Summary:	DBA extension module for PHP
 Summary(pl.UTF-8):	Moduł DBA dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.dba.php
+URL:		http://php.net/manual/en/book.dba.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(dba)
 Obsoletes:	php-dba < 4:5.3.28-7
+# withdrawn module of similar functionality but different API
+Obsoletes:	php-db < 3:5.0.0
 
 %description dba
 This is a dynamic shared object (DSO) for PHP that will add flat-file
@@ -706,7 +720,7 @@ Moduł dla PHP dodający obsługę dla baz danych opartych na plikach
 Summary:	DOM extension module for PHP
 Summary(pl.UTF-8):	Moduł DOM dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.dom.php
+URL:		http://php.net/manual/en/book.dom.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(dom)
 # it has some compatibility functions
@@ -726,7 +740,7 @@ Moduł PHP dodający nową obsługę DOM.
 Summary:	libenchant binder
 Summary(pl.UTF-8):	dowiązania biblioteki libenchant
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.exif.php
+URL:		http://php.net/manual/en/book.enchant.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(enchant) = %{enchantver}
 Obsoletes:	php-enchant < 4:5.3.28-7
@@ -756,7 +770,7 @@ ujednolicone API dla wielu narzędzi sprawdzających pisownię:
 Summary:	exif extension module for PHP
 Summary(pl.UTF-8):	Moduł exif dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.exif.php
+URL:		http://php.net/manual/en/book.exif.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(exif)
 Obsoletes:	php-exif < 4:5.3.28-7
@@ -772,7 +786,7 @@ Moduł PHP dodający obsługę znaczników EXIF w plikach obrazków.
 Summary:	libmagic bindings
 Summary(pl.UTF-8):	Wiązania do libmagic
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.fileinfo.php
+URL:		http://php.net/manual/en/book.fileinfo.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(fileinfo) = %{fileinfover}
@@ -799,7 +813,7 @@ pliku oraz kodowania plików tekstowych.
 Summary:	Extension for safely dealing with input parameters
 Summary(pl.UTF-8):	Rozszerzenie do bezpiecznej obsługi danych wejściowych
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.filter.php
+URL:		http://php.net/manual/en/book.filter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(filter)
@@ -824,7 +838,7 @@ mogą bezpiecznie używać do dostępu do danych.
 Summary:	FTP extension module for PHP
 Summary(pl.UTF-8):	Moduł FTP dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.ftp.php
+URL:		http://php.net/manual/en/book.ftp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(ftp)
 Obsoletes:	php-ftp < 4:5.3.28-7
@@ -840,7 +854,7 @@ Moduł PHP dodający obsługę protokołu FTP.
 Summary:	GD extension module for PHP
 Summary(pl.UTF-8):	Moduł GD dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.image.php
+URL:		http://php.net/manual/en/book.image.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 %if %{with system_gd}
 Requires:	gd >= 2.1
@@ -861,7 +875,7 @@ tworzenie i obróbkę obrazków.
 Summary:	gettext extension module for PHP
 Summary(pl.UTF-8):	Moduł gettext dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.gettext.php
+URL:		http://php.net/manual/en/book.gettext.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(gettext)
 Obsoletes:	php-gettext < 4:5.3.28-7
@@ -877,8 +891,9 @@ Moduł PHP dodający obsługę lokalizacji przez gettext.
 Summary:	gmp extension module for PHP
 Summary(pl.UTF-8):	Moduł gmp dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.gmp.php
+URL:		http://php.net/manual/en/book.gmp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	gmp >= 4.2
 Provides:	php(gmp)
 Obsoletes:	php-gmp < 4:5.3.28-7
 
@@ -894,7 +909,7 @@ liczbach o dowolnej długości.
 Summary:	HASH Message Digest Framework
 Summary(pl.UTF-8):	Szkielet do obliczania skrótów wiadomości
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.gmp.php
+URL:		http://php.net/manual/en/book.gmp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(hash) = %{hashver}
 %if %{with mhash}
@@ -917,7 +932,7 @@ wiadomości przy użyciu wspólnego interfejsu.
 Summary:	iconv extension module for PHP
 Summary(pl.UTF-8):	Moduł iconv dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.iconv.php
+URL:		http://php.net/manual/en/book.iconv.php
 Requires:	%{_libdir}/gconv
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	iconv
@@ -936,7 +951,7 @@ Summary:	IMAP extension module for PHP
 Summary(pl.UTF-8):	Moduł IMAP dla PHP
 Summary(pt_BR.UTF-8):	Um módulo para aplicações PHP que usam IMAP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.imap.php
+URL:		http://php.net/manual/en/book.imap.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Requires:	imap-lib >= 1:2007e-2
@@ -957,7 +972,7 @@ Um módulo para aplicações PHP que usam IMAP.
 Summary:	InterBase/Firebird database module for PHP
 Summary(pl.UTF-8):	Moduł bazy danych InterBase/Firebird dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.ibase.php
+URL:		http://php.net/manual/en/book.ibase.php
 %if %{with interbase_inst}
 %{?requires_php_extension}
 %else
@@ -977,7 +992,7 @@ Moduł PHP umożliwiający dostęp do baz danych InterBase i Firebird.
 Summary:	Internationalization extension (ICU wrapper)
 Summary(pl.UTF-8):	Rozszerzenie do internacjonalizacji (interfejs do ICU)
 Group:		Libraries
-URL:		http://www.php.net/intl
+URL:		http://php.net/intl
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(intl) = %{intlver}
 Obsoletes:	php-intl < 4:5.3.28-7
@@ -999,7 +1014,7 @@ daty/czasu/walut.
 Summary:	PHP C extension for JSON serialization
 Summary(pl.UTF-8):	Rozszerzenie C PHP dla serializacji JSON
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.json.php
+URL:		http://php.net/manual/en/book.json.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(json) = %{jsonver}
 Obsoletes:	php-json < 4:5.3.28-7
@@ -1018,7 +1033,7 @@ Summary:	LDAP extension module for PHP
 Summary(pl.UTF-8):	Moduł LDAP dla PHP
 Summary(pt_BR.UTF-8):	Um módulo para aplicações PHP que usam LDAP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.ldap.php
+URL:		http://php.net/manual/en/book.ldap.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(ldap)
 Obsoletes:	php-ldap < 4:5.3.28-7
@@ -1037,7 +1052,7 @@ Um módulo para aplicações PHP que usam LDAP.
 Summary:	mbstring extension module for PHP
 Summary(pl.UTF-8):	Moduł mbstring dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.mbstring.php
+URL:		http://php.net/manual/en/book.mbstring.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(mbstring)
 Obsoletes:	php-mbstring < 4:5.3.28-7
@@ -1053,8 +1068,9 @@ Moduł PHP dodający obsługę ciągów znaków wielobajtowych.
 Summary:	mcrypt extension module for PHP
 Summary(pl.UTF-8):	Moduł mcrypt dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.mcrypt.php
+URL:		http://php.net/manual/en/book.mcrypt.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	libmcrypt >= 2.5.6
 Provides:	php(mcrypt)
 Obsoletes:	php-mcrypt < 4:5.3.28-7
 
@@ -1065,28 +1081,11 @@ support.
 %description mcrypt -l pl.UTF-8
 Moduł PHP dodający możliwość szyfrowania poprzez bibliotekę mcrypt.
 
-%package mssql
-Summary:	MS SQL extension module for PHP
-Summary(pl.UTF-8):	Moduł MS SQL dla PHP
-Group:		Libraries
-URL:		http://www.php.net/manual/en/book.mssql.php
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php(mssql)
-Obsoletes:	php-mssql < 4:5.3.28-7
-
-%description mssql
-This is a dynamic shared object (DSO) for PHP that will add MS SQL
-databases support through FreeTDS library.
-
-%description mssql -l pl.UTF-8
-Moduł PHP dodający obsługę baz danych MS SQL poprzez bibliotekę
-FreeTDS.
-
 %package mysqli
 Summary:	MySQLi module for PHP
 Summary(pl.UTF-8):	Moduł MySQLi dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.mysqli.php
+URL:		http://php.net/manual/en/book.mysqli.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:	%{name}-mysqlnd = %{epoch}:%{version}-%{release}}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
@@ -1107,7 +1106,7 @@ MySQL w wersji 4.1 i nowszych.
 Summary:	MySQL Native Client Driver for PHP
 Summary(pl.UTF-8):	Sterownik natywnego klienta MySQL dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.mysqlnd.php
+URL:		http://php.net/manual/en/book.mysqlnd.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(mysqlnd)
 Obsoletes:	php-mysqlnd < 4:5.3.28-7
@@ -1145,10 +1144,12 @@ tym sterowniku - tylko raz.
 Summary:	Oracle 8+ database module for PHP
 Summary(pl.UTF-8):	Moduł bazy danych Oracle 8+ dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.oci8.php
+URL:		http://php.net/manual/en/book.oci8.php
 %{?requires_php_extension}
 Provides:	php(oci8)
 Obsoletes:	php-oci8 < 4:5.3.28-7
+# withdrawn module of similar functionality but different API
+Obsoletes:	php-oracle < 4:5.1.0
 
 %description oci8
 This is a dynamic shared object (DSO) for PHP that will add Oracle 7,
@@ -1163,7 +1164,7 @@ Summary:	ODBC extension module for PHP
 Summary(pl.UTF-8):	Moduł ODBC dla PHP
 Summary(pt_BR.UTF-8):	Um módulo para aplicações PHP que usam bases de dados ODBC
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.uodbc.php
+URL:		http://php.net/manual/en/book.uodbc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	unixODBC >= 2.1.1-3
 Provides:	php(odbc)
@@ -1186,7 +1187,7 @@ Group:		Libraries
 URL:		https://wiki.php.net/rfc/optimizerplus
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
-Provides:	php(opcache) = %{opcachever}
+Provides:	php(opcache) = %{version}
 
 %description opcache
 The Zend OPcache provides faster PHP execution through opcode caching
@@ -1208,7 +1209,7 @@ czyniąc wykonywanie kodu szybszym.
 Summary:	OpenSSL extension module for PHP
 Summary(pl.UTF-8):	Moduł OpenSSL dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.openssl.php
+URL:		http://php.net/manual/en/book.openssl.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(openssl)
 Obsoletes:	php-openssl < 4:5.3.28-7
@@ -1224,7 +1225,7 @@ Moduł PHP umożliwiający korzystanie z biblioteki OpenSSL.
 Summary:	Process Control extension module for PHP
 Summary(pl.UTF-8):	Moduł Process Control dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.pcntl.php
+URL:		http://php.net/manual/en/book.pcntl.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(pcntl)
 Obsoletes:	php-pcntl < 4:5.3.28-7
@@ -1258,7 +1259,7 @@ Moduł PHP umożliwiający korzystanie z perlowych wyrażeń regularnych
 Summary:	PHP Data Objects (PDO)
 Summary(pl.UTF-8):	Obsługa PHP Data Objects (PDO)
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.pdo.php
+URL:		http://php.net/manual/en/book.pdo.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	%{name}(PDO_API) = %{php_pdo_api_version}
@@ -1277,10 +1278,10 @@ Moduł PHP dodający obsługę PDO (PHP Data Objects).
 Summary:	PHP Data Objects (PDO) FreeTDS support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą FreeTDS
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-dblib.php
+URL:		http://php.net/manual/en/ref.pdo-dblib.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
-Provides:	php(dblib)
+Provides:	php(pdo_dblib)
 Obsoletes:	php-pdo-dblib < 4:5.3.28-7
 
 %description pdo-dblib
@@ -1295,10 +1296,11 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) Firebird support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą Firebirda
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-firebird.php
+URL:		http://php.net/manual/en/ref.pdo-firebird.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-firebird)
+Provides:	php(pdo_firebird)
 Obsoletes:	php-pdo-firebird < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_FIREBIRD
 
@@ -1314,11 +1316,12 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) MySQL support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą MySQL-a
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-mysql.php
+URL:		http://php.net/manual/en/ref.pdo-mysql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:	%{name}-mysqlnd = %{epoch}:%{version}-%{release}}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-mysql)
+Provides:	php(pdo_mysql)
 Obsoletes:	php-pdo-mysql < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_MYSQL
 
@@ -1334,10 +1337,11 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) Oracle support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą Oracle'a
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-oci.php
+URL:		http://php.net/manual/en/ref.pdo-oci.php
 %{?requires_php_extension}
 %{?requires_php_pdo_module}
 Provides:	php(pdo-oci)
+Provides:	php(pdo_oci)
 Obsoletes:	php-pdo-oci < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_OCI
 
@@ -1353,10 +1357,11 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) ODBC support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą ODBC
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-odbc.php
+URL:		http://php.net/manual/en/ref.pdo-odbc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-odbc)
+Provides:	php(pdo_odbc)
 Obsoletes:	php-pdo-odbc < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_ODBC
 
@@ -1372,11 +1377,11 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) PostgreSQL support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą PostgreSQL-a
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-pgsql.php
+URL:		http://php.net/manual/en/ref.pdo-pgsql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-pgsql)
-Provides:	php-pecl-PDO_PGSQL
+Provides:	php(pdo_pgsql)
 Obsoletes:	php-pdo-pgsql < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_PGSQL < 4:5.2.1-2
 
@@ -1392,10 +1397,11 @@ interfejsu PDO.
 Summary:	PHP Data Objects (PDO) SQLite support
 Summary(pl.UTF-8):	Moduł PHP Data Objects (PDO) z obsługą SQLite
 Group:		Libraries
-URL:		http://www.php.net/manual/en/ref.pdo-sqlite.php
+URL:		http://php.net/manual/en/ref.pdo-sqlite.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-sqlite)
+Provides:	php(pdo_sqlite)
 Obsoletes:	php-pdo-sqlite < 4:5.3.28-7
 Obsoletes:	php-pecl-PDO_SQLITE
 
@@ -1411,7 +1417,7 @@ interfejsu PDO.
 Summary:	PostgreSQL database module for PHP
 Summary(pl.UTF-8):	Moduł bazy danych PostgreSQL dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.pgsql.php
+URL:		http://php.net/manual/en/book.pgsql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(pgsql)
 Obsoletes:	php-pgsql < 4:5.3.28-7
@@ -1427,13 +1433,14 @@ Moduł PHP umożliwiający dostęp do bazy danych PostgreSQL.
 Um módulo para aplicações PHP que usam bancos de dados postgresql.
 
 %package phar
-Summary:	phar database module for PHP
+Summary:	Phar archive module for PHP
 Summary(pl.UTF-8):	Moduł phar dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.phar.php
+URL:		http://php.net/manual/en/book.phar.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Requires:	%{name}-hash = %{epoch}:%{version}-%{release}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
+Requires:	alternatives
 Suggests:	%{name}-cli
 # zlib is required by phar program, but as phar cli is optional should the dep be too
 Suggests:	%{name}-zlib
@@ -1453,7 +1460,7 @@ Moduł PHP umożliwiający dostęp do achiwów .phar.
 Summary:	POSIX extension module for PHP
 Summary(pl.UTF-8):	Moduł POSIX dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.posix.php
+URL:		http://php.net/manual/en/book.posix.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(posix)
 Obsoletes:	php-posix < 4:5.3.28-7
@@ -1469,7 +1476,7 @@ Moduł PHP umożliwiający korzystanie z funkcji POSIX.
 Summary:	pspell extension module for PHP
 Summary(pl.UTF-8):	Moduł pspell dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.pspell.php
+URL:		http://php.net/manual/en/book.pspell.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(pspell)
 Obsoletes:	php-pspell < 4:5.3.28-7
@@ -1487,7 +1494,7 @@ sprawdzanie pisowni słowa i sugerowanie poprawek.
 Summary:	readline extension module for PHP
 Summary(pl.UTF-8):	Moduł readline dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.readline.php
+URL:		http://php.net/manual/en/book.readline.php
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 Provides:	php(readline)
 Obsoletes:	php-readline < 4:5.3.28-7
@@ -1503,7 +1510,7 @@ Moduł PHP dodający obsługę funkcji readline (tylko do SAPI cli i cgi).
 Summary:	recode extension module for PHP
 Summary(pl.UTF-8):	Moduł recode dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.recode.php
+URL:		http://php.net/manual/en/book.recode.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	recode >= 3.5d-3
 Provides:	php(recode)
@@ -1539,7 +1546,7 @@ Moduł PHP dodający obsługę sesji.
 Summary:	Shared Memory Operations extension module for PHP
 Summary(pl.UTF-8):	Moduł shmop dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.shmop.php
+URL:		http://php.net/manual/en/book.shmop.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(shmop)
 Obsoletes:	php-shmop < 4:5.3.28-7
@@ -1555,7 +1562,7 @@ Moduł PHP umożliwiający korzystanie z pamięci dzielonej.
 Summary:	Simple XML extension module for PHP
 Summary(pl.UTF-8):	Moduł prostego rozszerzenia XML dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.simplexml.php
+URL:		http://php.net/manual/en/book.simplexml.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(simplexml)
@@ -1572,7 +1579,7 @@ Moduł PHP dodający obsługę prostego XML-a.
 Summary:	SNMP extension module for PHP
 Summary(pl.UTF-8):	Moduł SNMP dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.snmp.php
+URL:		http://php.net/manual/en/book.snmp.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-sockets = %{epoch}:%{version}-%{release}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
@@ -1590,7 +1597,7 @@ Moduł PHP dodający obsługę SNMP.
 Summary:	soap extension module for PHP
 Summary(pl.UTF-8):	Moduł soap dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.soap.php
+URL:		http://php.net/manual/en/book.soap.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(soap)
 Obsoletes:	php-soap < 4:5.3.28-7
@@ -1606,7 +1613,7 @@ Moduł PHP dodający obsługę SOAP/WSDL.
 Summary:	sockets extension module for PHP
 Summary(pl.UTF-8):	Moduł socket dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.sockets.php
+URL:		http://php.net/manual/en/book.sockets.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sockets)
 Obsoletes:	php-sockets < 4:5.3.28-7
@@ -1669,7 +1676,7 @@ dysku.
 Summary:	SysV msg extension module for PHP
 Summary(pl.UTF-8):	Moduł SysV msg dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.sem.php
+URL:		http://php.net/manual/en/book.sem.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sysvmsg)
 Obsoletes:	php-sysvmsg < 4:5.3.28-7
@@ -1685,7 +1692,7 @@ Moduł PHP umożliwiający korzystanie z kolejek komunikatów SysV.
 Summary:	SysV sem extension module for PHP
 Summary(pl.UTF-8):	Moduł SysV sem dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.sem.php
+URL:		http://php.net/manual/en/book.sem.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sysvsem)
 Obsoletes:	php-sysvsem < 4:5.3.28-7
@@ -1701,7 +1708,7 @@ Moduł PHP umożliwiający korzystanie z semaforów SysV.
 Summary:	SysV shm extension module for PHP
 Summary(pl.UTF-8):	Moduł SysV shm dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.shmop.php
+URL:		http://php.net/manual/en/book.sem.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sysvshm)
 Obsoletes:	php-sysvshm < 4:5.3.28-7
@@ -1730,7 +1737,7 @@ Ten pakiet zawiera pliki testów jednostkowych dla PHP i rozszerzeń.
 Summary:	Tidy extension module for PHP
 Summary(pl.UTF-8):	Moduł Tidy dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.tidy.php
+URL:		http://php.net/manual/en/book.tidy.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	tidy
 Provides:	php(tidy)
@@ -1747,7 +1754,7 @@ Moduł PHP umożliwiający korzystanie z tidy.
 Summary:	tokenizer extension module for PHP
 Summary(pl.UTF-8):	Moduł rozszerzenia tokenizer dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.tokenizer.php
+URL:		http://php.net/manual/en/book.tokenizer.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(tokenizer)
 Obsoletes:	php-tokenizer < 4:5.3.28-7
@@ -1763,7 +1770,7 @@ Moduł PHP dodający obsługę tokenizera do PHP.
 Summary:	wddx extension module for PHP
 Summary(pl.UTF-8):	Moduł wddx dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.wddx.php
+URL:		http://php.net/manual/en/book.wddx.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 # - wddx doesn't require session as it's disabled at compile time:
 #   if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
@@ -1784,7 +1791,7 @@ Moduł PHP umożliwiający korzystanie z wddx.
 Summary:	XML extension module for PHP
 Summary(pl.UTF-8):	Moduł XML dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.xml.php
+URL:		http://php.net/manual/en/book.xml.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(xml)
 Obsoletes:	php-xml < 4:5.3.28-7
@@ -1803,7 +1810,7 @@ następnie definiować procedury obsługi dla różnych zdarzeń XML.
 Summary:	XML Reader extension module for PHP
 Summary(pl.UTF-8):	Moduł XML Reader dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.xmlreader.php
+URL:		http://php.net/manual/en/book.xmlreader.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-dom = %{epoch}:%{version}-%{release}
 Provides:	php(xmlreader)
@@ -1824,7 +1831,7 @@ zatrzymujący się na każdym węźle po drodze.
 Summary:	xmlrpc extension module for PHP
 Summary(pl.UTF-8):	Moduł xmlrpc dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.xmlrpc.php
+URL:		http://php.net/manual/en/book.xmlrpc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xml = %{epoch}:%{version}-%{release}
 Provides:	php(xmlrpc)
@@ -1841,7 +1848,7 @@ Moduł PHP dodający obsługę XMLRPC.
 Summary:	Fast, non-cached, forward-only means to write XML data
 Summary(pl.UTF-8):	Szybka, nie cachowana metoda zapisu danych w formacie XML
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.xmlwriter.php
+URL:		http://php.net/manual/en/book.xmlwriter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(xmlwriter)
 Obsoletes:	php-pecl-xmlwriter
@@ -1861,7 +1868,7 @@ plików zawierających dane XML.
 Summary:	xsl extension module for PHP
 Summary(pl.UTF-8):	Moduł xsl dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.xsl.php
+URL:		http://php.net/manual/en/book.xsl.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-dom = %{epoch}:%{version}-%{release}
 Requires:	libxslt >= 1.0.18
@@ -1881,7 +1888,7 @@ Moduł PHP dodający nową obsługę XSLT (przy użyciu libxslt).
 Summary:	Zip management extension
 Summary(pl.UTF-8):	Zarządzanie archiwami zip
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.zip.php
+URL:		http://php.net/manual/en/book.zip.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 %{?with_system_libzip:Requires:	libzip >= 0.10.1-2}
 Provides:	php(zip) = %{zipver}
@@ -1899,7 +1906,7 @@ odczyt archiwów zip.
 Summary:	Zlib extension module for PHP
 Summary(pl.UTF-8):	Moduł zlib dla PHP
 Group:		Libraries
-URL:		http://www.php.net/manual/en/book.zlib.php
+URL:		http://php.net/manual/en/book.zlib.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(zlib)
 Obsoletes:	php-zlib < 4:5.3.28-7
@@ -1916,7 +1923,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
@@ -1946,8 +1952,6 @@ cp -p php.ini-production php.ini
 %endif
 %patch43 -p1
 %patch44 -p1
-#%patch45 -p1 # imap annotations. fixme
-#%patch46 -p1 # imap myrights. fixme
 %if %{with suhosin}
 %patch47 -p1
 %endif
@@ -1958,17 +1962,15 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1
-#%patch68 -p1
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
 
-sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
+%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -2004,22 +2006,22 @@ sed -i -e 's#-fvisibility=hidden##g' configure*
 
 # disable broken tests
 # says just "Terminated" twice and fails
-mv sapi/cli/tests/022.phpt{,.broken}
+%{__mv} sapi/cli/tests/022.phpt{,.broken}
 
 # really dumb test, executable binary name is .libs/ something when building
 # https://bugs.php.net/bug.php?id=54514
-mv tests/basic/bug54514.phpt{,.disable}
+%{__mv} tests/basic/bug54514.phpt{,.disable}
 
 # breaks whole testsuite unexpectedly:
 # Fatal error: Call to undefined function gzencode() in run-tests.php on line 1714
 # probably broken as zlib is built as shared
-mv ext/soap/tests/server019.phpt{,disable}
+%{__mv} ext/soap/tests/server019.phpt{,disable}
 # Fatal error: Call to undefined function gzcompress() in run-tests.php on line 1728
-mv ext/soap/tests/server020.phpt{,disable}
+%{__mv} ext/soap/tests/server020.phpt{,disable}
 
 # runs out of memory and kills carme vserver
 # PASS Bug #39438 (Fatal error: Out of memory) [Zend/tests/bug39438.phpt]
-mv Zend/tests/bug39438.phpt{,.disable}
+%{__mv} Zend/tests/bug39438.phpt{,.disable}
 
 # php-5.3.3/ext/standard/tests/file/statpage.phpt
 %{__rm} ext/standard/tests/file/statpage.phpt
@@ -2107,10 +2109,8 @@ if test "$ver" != "%{pharver}"; then
 	: Update the pharver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
-if test "$ver" != "%{sqlite3ver}"; then
-	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
-	: Update the sqlite3ver macro and rebuild.
+ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	exit 1
 fi
 ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
@@ -2125,12 +2125,6 @@ if test "$ver" != "%{jsonver}"; then
 	: Update the jsonver macro and rebuild.
 	exit 1
 fi
-ver=$(awk '/#define PHP_ZENDOPCACHE_VERSION/ {print $3}' ext/opcache/ZendAccelerator.h | xargs)
-if test "$ver" != "%{opcachever}"; then
-	: Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}.
-	: Update the opcachever macro and rebuild.
-	exit 1
-fi
 ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
 if test "$ver" != "%{phpdbgver}"; then
 	: Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
@@ -2143,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)
@@ -2236,10 +2228,13 @@ for sapi in $sapis; do
 	esac
 
 	%configure \
+	EXTRA_LDFLAGS="%{rpmldflags}" \
+	--program-suffix=%{php_suffix} \
 	$sapi_args \
 %if "%{!?configure_cache:0}%{?configure_cache}" == "0"
 	--cache-file=config.cache \
 %endif
+	--datadir=%{php_datadir} \
 	--with-libdir=%{_lib} \
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
@@ -2283,7 +2278,7 @@ for sapi in $sapis; do
 	%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pgsql:--with-pdo-pgsql=shared} \
 	%{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
-	%{?with_webp:--with-vpx-dir=/usr} \
+	%{?with_webp:--with-webp-dir=/usr} \
 	--without-libexpat-dir \
 	%{__enable_disable posix posix shared} \
 	--enable-shared \
@@ -2331,7 +2326,6 @@ for sapi in $sapis; do
 	%{?with_pspell:--with-pspell=shared} \
 	%{__with_without readline readline shared} \
 	%{?with_recode:--with-recode=shared} \
-	%{__with_without ereg regex system} \
 	%{?with_snmp:--with-snmp=shared} \
 	%{!?with_pdo_sqlite:--without-pdo-sqlite} \
 	%{__with_without sqlite3 sqlite3 shared,/usr} \
@@ -2498,19 +2492,24 @@ cp -pf Makefile.cli Makefile
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # version the .phar files
-mv $RPM_BUILD_ROOT%{_bindir}/phar{,%{ver_suffix}}.phar
-mv $RPM_BUILD_ROOT%{_mandir}/man1/phar{,%{ver_suffix}}.phar.1
-# make link relative
-ln -sfn phar%{ver_suffix}.phar $RPM_BUILD_ROOT%{_bindir}/phar
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/phar{,%{php_suffix}}.phar
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/phar{,%{php_suffix}}.1
+# touch for ghost
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/phar
+touch $RPM_BUILD_ROOT%{_bindir}/phar
+touch $RPM_BUILD_ROOT%{_mandir}/man1/phar.1
 
 # version suffix
 v=$(echo %{version} | cut -d. -f1-2)
 
 # install Apache2 DSO module
 %if %{with apache2}
+# versioned libphp
 libtool --mode=install install -p sapi/apache2handler/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache
-mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp7{,-$v}.so
-ln -s libphp7-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.so
+sed -i -e "s|libphp7|libphp%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
+ln -s libphp%{php_suffix}.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
 %endif
 
 # install litespeed sapi
@@ -2520,15 +2519,28 @@ libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/
 
 %if %{with phpdbg}
 %{__make} -f Makefile.phpdbg install-phpdbg \
+	INSTALL="libtool --mode=install install -p" \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 %endif
 
+# touch for ghost
+touch $RPM_BUILD_ROOT%{_bindir}/phpize
+touch $RPM_BUILD_ROOT%{_mandir}/man1/phpize.1
+touch $RPM_BUILD_ROOT%{_bindir}/php-config
+touch $RPM_BUILD_ROOT%{_mandir}/man1/php-config.1
+
 %if %{with milter}
 %{__make} -f Makefile.milter install-milter \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 %endif
 
+# versioned libphp_common
 libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libphp_common.la $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libphp_common-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}-%{version}.so
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libphp_common.so
+ln -s libphp_common%{php_suffix}-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.so
+sed -i -e "s|libphp_common|libphp_common%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la
 
 # install CGI/FCGI
 %if %{with cgi}
@@ -2550,9 +2562,12 @@ install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
 
+# touch for ghost for alternatives
+touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
+
 %{__sed} -i -e '
-	s#/usr/lib/php#%{php_extensiondir}#
-	s#/etc/php/#%{_sysconfdir}/#
+	s#/usr/lib/php#%{php_extensiondir}#g
+	s#/etc/php/#%{_sysconfdir}/#g
 	s#@processname@#%{name}-fpm#g
 ' $RPM_BUILD_ROOT{/etc/{rc.d/init.d/%{name}-fpm,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf,%{_sysconfdir}/php-fpm.d/www.conf}
 %endif
@@ -2561,24 +2576,16 @@ cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
 %if %{with embed}
 # we could use install-headers from Makefile.embed, but that would reinstall all headers
 # install-sapi installs to wrong dir, so just do it all manually
-install -d $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed
-install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}
-cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed
+install -d $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed
+install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}/libphp%{php_suffix}.so
+cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed
 %endif
 
-# install CLI
-# versioned suffix is always installed
-libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php%{ver_suffix}
-cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php%{ver_suffix}.1
-
-%if %{with default_php}
-# man for php
-echo ".so php%{ver_suffix}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1
-# link as /usr/bin/php
-ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php
-# php.cli link for backward compatibility
-ln -sf php $RPM_BUILD_ROOT%{_bindir}/php.cli
-%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
 
 cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
@@ -2586,14 +2593,14 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
 %if %{with apache2}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
 %endif
 
 # ensure that paths are correct for current php version and arch
 grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs -r \
 %{__sed} -i -e '
-	s#/usr/lib/php#%{php_extensiondir}#
-	s#/etc/php#%{_sysconfdir}#
+	s#/usr/lib/php#%{php_extensiondir}#g
+	s#/etc/php/#%{_sysconfdir}/#g
 '
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
@@ -2603,7 +2610,7 @@ cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
 
 # for CLI SAPI only
-mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
 
 # use system automake and {lib,sh}tool
 ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
@@ -2619,21 +2626,21 @@ for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
 	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
 	break
 done
-sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
+sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize%{php_suffix}
 
 # for php-pecl-mailparse
-install -d $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
-cp -p ext/mbstring/libmbfl/mbfl/*.h $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring
+install -d $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/ext/mbstring
+cp -p ext/mbstring/libmbfl/mbfl/*.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/ext/mbstring
 
 # tests
-install -d $RPM_BUILD_ROOT%{php_data_dir}/tests/php
-install -p run-tests.php $RPM_BUILD_ROOT%{php_data_dir}/tests/php/run-tests.php
-cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php
+install -d $RPM_BUILD_ROOT%{php_datadir}/tests/php
+install -p run-tests.php $RPM_BUILD_ROOT%{php_datadir}/tests/php/run-tests.php
+cp -a tests/* $RPM_BUILD_ROOT%{php_datadir}/tests/php
 
 # fix install paths, avoid evil rpaths
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
+sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la
 # better solution?
-sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4
+sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -2648,17 +2655,46 @@ if [ "$1" = "0" ]; then
 	%service -q httpd restart
 fi
 
+%post cli
+update-alternatives \
+	--install %{_bindir}/php php %{_bindir}/php%{php_suffix} %{php_suffix} \
+	--slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+
+%postun cli
+if [ $1 -eq 0 ]; then
+	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} \
+	--slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+update-alternatives \
+	--install %{_bindir}/php-config php-config %{_bindir}/php-config%{php_suffix} %{php_suffix} \
+	--slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+
+%postun devel
+if [ $1 -eq 0 ]; then
+	update-alternatives --remove phpize %{_bindir}/phpize%{php_suffix} || :
+	update-alternatives --remove php-config %{_bindir}/php-config%{php_suffix} || :
+fi
+
 %pre fpm
 %useradd -u 51 -r -s /bin/false -c "HTTP User" -g http http
 
 %post fpm
 /sbin/chkconfig --add %{name}-fpm
 %service %{name}-fpm restart
+update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} || :
 
 %preun fpm
 if [ "$1" = "0" ]; then
 	%service %{name}-fpm stop
 	/sbin/chkconfig --del %{name}-fpm
+	update-alternatives --remove php-fpm %{_sbindir}/php%{php_suffix}-fpm || :
 fi
 
 %postun fpm
@@ -2669,7 +2705,7 @@ fi
 %post	embedded -p /sbin/ldconfig
 %postun	embedded -p /sbin/ldconfig
 
-%post common
+%posttrans common
 # PHP 5.3 requires timezone being setup, try setup it from tzdata
 if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/sysconfig/timezone ]; then
 	TIMEZONE=
@@ -2679,7 +2715,6 @@ if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/s
 	fi
 fi
 
-%posttrans common
 # minimizing apache restarts logics. we restart webserver:
 #
 # 1. at the end of transaction. (posttrans, feature from rpm 4.4.2)
@@ -2726,16 +2761,24 @@ fi
 sed -i -e 's#modules/libphp[57].so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php.conf
 
 # common macros called at extension post/postun scriptlet
-%define	extension_scripts() \
-%post %1 \
+%define ext_post \
 if [ "$1" = "1" ]; then \
 	%php_webserver_restart \
 fi \
-\
-%postun %1 \
+%{nil}
+
+%define ext_postun \
 if [ "$1" = "0" ]; then \
 	%php_webserver_restart \
-fi
+fi \
+%{nil}
+
+%define extension_scripts() \
+%post %1 \
+%ext_post \
+\
+%postun %1 \
+%ext_postun \
 %{nil}
 
 # extension scripts defines
@@ -2779,7 +2822,6 @@ fi
 %extension_scripts pdo-pgsql
 %extension_scripts pdo-sqlite
 %extension_scripts pgsql
-%extension_scripts phar
 %extension_scripts pcntl
 %extension_scripts posix
 %extension_scripts pspell
@@ -2806,6 +2848,18 @@ fi
 %extension_scripts zip
 %extension_scripts zlib
 
+%post phar
+%ext_post
+update-alternatives \
+	--install %{_bindir}/phar phar %{_bindir}/phar%{php_suffix}.phar %{php_suffix} \
+	--slave %{_mandir}/man1/phar.1 phar.1 %{_mandir}/man1/phar%{php_suffix}.1* || :
+
+%postun phar
+%ext_postun
+if [ $1 -eq 0 ]; then
+	update-alternatives --remove phar %{_bindir}/phar%{php_suffix}.phar || :
+fi
+
 %if %{with apache2}
 %files -n apache-mod_%{name}
 %defattr(644,root,root,755)
@@ -2813,7 +2867,7 @@ fi
 %dir %{_sysconfdir}/apache2handler.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
 %attr(755,root,root) %{_libdir}/apache/mod_php.so
-%attr(755,root,root) %{_libdir}/apache/libphp7-*.*.so
+%attr(755,root,root) %{_libdir}/apache/libphp%{php_suffix}.so
 %endif
 
 %if %{with litespeed}
@@ -2834,20 +2888,17 @@ fi
 %if %{with embed}
 %files embedded
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libphp7.so
+%attr(755,root,root) %{_libdir}/libphp%{php_suffix}.so
 %endif
 
 %files cli
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/cli.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
-%attr(755,root,root) %{_bindir}/php%{ver_suffix}
-%{_mandir}/man1/php%{ver_suffix}.1*
-%if %{with default_php}
-%attr(755,root,root) %{_bindir}/php
-%attr(755,root,root) %{_bindir}/php.cli
-%{_mandir}/man1/php.1*
-%endif
+%attr(755,root,root) %{_bindir}/php%{php_suffix}
+%{_mandir}/man1/php%{php_suffix}.1*
+%ghost %{_bindir}/php
+%ghost %{_mandir}/man1/php.1*
 
 %if %{with fpm}
 %files fpm
@@ -2857,6 +2908,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.d/www.conf
 %attr(755,root,root) %{_sbindir}/%{name}-fpm
+%ghost %{_sbindir}/php-fpm
 %{_mandir}/man8/%{name}-fpm.8*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}-fpm
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
@@ -2865,8 +2917,8 @@ fi
 %if %{with phpdbg}
 %files phpdbg
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/phpdbg
-%{_mandir}/man1/phpdbg.1*
+%attr(755,root,root) %{_bindir}/phpdbg%{php_suffix}
+%{_mandir}/man1/phpdbg%{php_suffix}.1*
 %endif
 
 %if %{with milter}
@@ -2881,7 +2933,8 @@ fi
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%attr(755,root,root) %{_libdir}/libphp_common-*.so
+%attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}-*.so
+%dir %{php_datadir}
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh
@@ -2889,14 +2942,18 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %doc CODING_STANDARDS README.{EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,TESTING2,UNIX-BUILD-SYSTEM,input_filter}
-%attr(755,root,root) %{_bindir}/phpize
-%attr(755,root,root) %{_bindir}/php-config
-%attr(755,root,root) %{_libdir}/libphp_common.so
-%{_libdir}/libphp_common.la
-%{_includedir}/php
+%attr(755,root,root) %{_bindir}/phpize%{php_suffix}
+%attr(755,root,root) %{_bindir}/php-config%{php_suffix}
+%ghost %{_bindir}/phpize
+%ghost %{_bindir}/php-config
+%attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}.so
+%{_libdir}/libphp_common%{php_suffix}.la
+%{_includedir}/php/php%{php_suffix}
 %{_libdir}/%{name}/build
-%{_mandir}/man1/php-config.1*
-%{_mandir}/man1/phpize.1*
+%{_mandir}/man1/php-config%{php_suffix}.1*
+%ghost %{_mandir}/man1/php-config.1*
+%{_mandir}/man1/phpize%{php_suffix}.1*
+%ghost %{_mandir}/man1/phpize.1*
 
 %if %{with bcmath}
 %files bcmath
@@ -3232,10 +3289,11 @@ fi
 %doc ext/phar/{CREDITS,TODO}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phar.ini
 %attr(755,root,root) %{php_extensiondir}/phar.so
-%attr(755,root,root) %{_bindir}/phar
-%attr(755,root,root) %{_bindir}/phar%{ver_suffix}.phar
-%{_mandir}/man1/phar.1*
-%{_mandir}/man1/phar%{ver_suffix}.phar.1
+%attr(755,root,root) %{_bindir}/phar%{php_suffix}.phar
+%{_mandir}/man1/phar%{php_suffix}.1*
+%{_mandir}/man1/phar.phar.1*
+%ghost %{_bindir}/phar
+%ghost %{_mandir}/man1/phar.1*
 %endif
 
 %if %{with posix}
@@ -3347,18 +3405,18 @@ fi
 
 %files tests
 %defattr(644,root,root,755)
-%dir %{php_data_dir}/tests
-%dir %{php_data_dir}/tests/php
-%{php_data_dir}/tests/php/basic
-%{php_data_dir}/tests/php/classes
-%{php_data_dir}/tests/php/func
-%{php_data_dir}/tests/php/lang
-%{php_data_dir}/tests/php/output
-%{php_data_dir}/tests/php/run-test
-%{php_data_dir}/tests/php/security
-%{php_data_dir}/tests/php/strings
-%{php_data_dir}/tests/php/quicktester.inc
-%attr(755,root,root) %{php_data_dir}/tests/php/run-tests.php
+%dir %{php_datadir}/tests
+%dir %{php_datadir}/tests/php
+%{php_datadir}/tests/php/basic
+%{php_datadir}/tests/php/classes
+%{php_datadir}/tests/php/func
+%{php_datadir}/tests/php/lang
+%{php_datadir}/tests/php/output
+%{php_datadir}/tests/php/run-test
+%{php_datadir}/tests/php/security
+%{php_datadir}/tests/php/strings
+%{php_datadir}/tests/php/quicktester.inc
+%attr(755,root,root) %{php_datadir}/tests/php/run-tests.php
 
 %if %{with tidy}
 %files tidy