X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=568a760e1b5e5008b56e0605f7c309b911bd3ba8;hb=c2335c46f34220f6aa9e322876acefadac67f18b;hp=ef161344585db68e4cdb56a9a53968d54769f4a7;hpb=b8468741b77b89e4761dd23995adb9b1b530ec6f;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index ef16134..568a760 100644
--- a/php.spec
+++ b/php.spec
@@ -39,7 +39,7 @@
 # Reflection
 #
 # Conditional build:
-%bcond_without	default_php	# use this PHP as default PHP in distro
+%bcond_with	default_php	# use this PHP as default PHP in distro
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
@@ -135,13 +135,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.4.16
+Version:	5.4.21
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	3d2c694d28861d707b2622c3cc941cff
+# Source0-md5:	3dcf021e89b039409d0b1c346b936b5f
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -154,7 +154,7 @@ Source12:	%{orgname}-branch.sh
 Source13:	dep-tests.sh
 Source14:	skip-tests.sh
 Patch0:		%{orgname}-shared.patch
-Patch1:		%{orgname}-pldlogo.patch
+Patch1:		%{orgname}-tld.patch
 Patch2:		%{orgname}-mail.patch
 Patch3:		%{orgname}-link-libs.patch
 Patch4:		%{orgname}-libpq_fs_h_path.patch
@@ -213,6 +213,8 @@ Patch63:	%{orgname}-mysql-nowarning.patch
 #Patch64:	%{orgname}-m4.patch # not needed on 5.4 branch
 Patch65:	system-libzip.patch
 Patch66:	php-db.patch
+Patch67:	php-fileinfo.patch
+Patch68:	php-sqlite3.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -250,11 +252,7 @@ BuildRequires:	libpng-devel >= 1.0.8
 #BuildRequires:	libtiff-devel
 %{?with_webp:BuildRequires:	libvpx-devel}
 BuildRequires:	tokyocabinet-devel
-%if "%{pld_release}" != "ac"
 BuildRequires:	libtool >= 2:2.2
-%else
-BuildRequires:	libtool >= 1.4.3
-%endif
 #BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-devel >= 1:2.7.6-4
 BuildRequires:	libxslt-devel >= 1.1.0
@@ -310,12 +308,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # Extension versions
 %define		bz2ver		1.0
 %define		enchantver	1.1.0
-%define		fileinfover	1.0.5
+%define		fileinfover	1.0.5-dev
 %define		hashver		1.0
 %define		intlver		1.1.0
 %define		jsonver		1.2.1
 %define		pharver		2.0.1
-%define		sqlite3ver	0.7
+%define		sqlite3ver	0.7-dev
 %define		zipver		1.11.0
 
 %define		zend_zts		%{!?with_zts:0}%{?with_zts:1}
@@ -440,9 +438,7 @@ Provides:	php(cgi)
 Provides:	php(fcgi)
 Provides:	webserver(php) = %{version}
 Obsoletes:	php-fcgi < 4:5.3.0
-%if "%{pld_release}" != "ac"
 Conflicts:	logrotate < 3.8.0
-%endif
 
 %description cgi
 PHP as CGI or FastCGI program.
@@ -455,7 +451,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}
-Obsoletes:	php-program
+Provides:	php-program
 
 %description cli
 PHP as CLI interpreter.
@@ -556,11 +552,7 @@ Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	autoconf >= 2.13
 Requires:	automake
-%if "%{pld_release}" != "ac"
 Requires:	libtool >= 2:2.2
-%else
-Requires:	libtool
-%endif
 %{?with_pcre:Requires:	pcre-devel >= 8.10}
 Requires:	shtool
 Obsoletes:	php-devel
@@ -1886,9 +1878,7 @@ cp -p php.ini-production php.ini
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-%if "%{pld_release}" != "ac"
 %patch34 -p1
-%endif
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
@@ -1917,6 +1907,8 @@ cp -p php.ini-production php.ini
 %patch63 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
+%patch67 -p1
+%patch68 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
@@ -2426,9 +2418,6 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 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
-%if "%{pld_release}" == "ac"
-%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
-%endif
 
 %{__sed} -i -e '
 	s#/usr/lib/php#%{php_extensiondir}#
@@ -2493,16 +2482,11 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
 mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
 
 # use system automake and {lib,sh}tool
-%if "%{pld_release}" != "ac"
-	ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build
-	for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
-		ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build
-	done
-	ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
-%else
-	ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build
-	ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
-%endif
+ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build
+for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
+	ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build
+done
+ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
 ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build
 
 # for php-pecl-mailparse