X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=189f8356f01683f892a369a3e1abd75991ff6617;hb=95f70ac8534432048f1974019a5a62d88a12fe89;hp=a876e1f04fb061fb1a5cbb2a16a47be9ad7f6ad1;hpb=bde3c0d32dcc51f8ed7a225e727564eda956cf53;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index a876e1f..189f835 100644
--- a/php.spec
+++ b/php.spec
@@ -113,6 +113,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define		orgname	php
 %if "%{pld_release}" == "ac_"
 %define		php_suffix 53
+%define		_noautoreqdep libphp_common.*
 %else
 %define		php_suffix %{nil}
 %endif
@@ -125,13 +126,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.3.21
+Version:	5.3.22
 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:	1b214fc19bb5f5c0902ba27c74d5f4a2
+# Source0-md5:	bf351426fc7f97aa13914062958a6100
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -202,7 +203,6 @@ Patch64:	%{orgname}-m4.patch
 Patch65:	system-libzip.patch
 Patch66:	%{orgname}-db.patch
 Patch67:	php-litespeed.patch
-Patch68:	file-magic.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}
@@ -430,6 +430,9 @@ 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.
@@ -565,7 +568,7 @@ Requires:	libtool >= 2:2.2
 %else
 Requires:	libtool
 %endif
-%{?with_embed:Requires:	%{orgname}-embedded = %{epoch}:%{version}-%{release}}
+%{?with_embed:Requires:	%{name}-embedded = %{epoch}:%{version}-%{release}}
 %{?with_pcre:Requires:	pcre-devel >= 8.10}
 Requires:	shtool
 Obsoletes:	php-pear-devel
@@ -1958,14 +1961,9 @@ cp -p php.ini-production php.ini
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
 %patch67 -p1
-%patch68 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
-# somewhy php devs have embedded magic database into php extension. yuck!
-# rebuild data file for now
-mv ext/fileinfo/data_file.c{,.php-src}
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -2405,11 +2403,15 @@ ln -sfn phar.phar $RPM_BUILD_ROOT%{_bindir}/phar
 # install Apache1 DSO module
 %if %{with apache1}
 libtool --mode=install install -p 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
 %endif
 
 # install Apache2 DSO module
 %if %{with apache2}
 libtool --mode=install install -p 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
 %endif
 
 # install litespeed sapi
@@ -2438,6 +2440,9 @@ 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}#
@@ -2689,6 +2694,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
 %endif
 
 %if %{with apache2}
@@ -2698,6 +2704,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
 %endif
 
 %if %{with litespeed}