packages (DEVEL): php/php.spec - up to 5.4.4, use php54 as package basename
glen
glen at pld-linux.org
Mon Jul 2 17:50:04 CEST 2012
Author: glen Date: Mon Jul 2 15:50:03 2012 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 5.4.4, use php54 as package basename
---- Files affected:
packages/php:
php.spec (1.945.2.16 -> 1.945.2.17)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945.2.16 packages/php/php.spec:1.945.2.17
--- packages/php/php.spec:1.945.2.16 Mon Jul 2 17:06:25 2012
+++ packages/php/php.spec Mon Jul 2 17:49:58 2012
@@ -123,6 +123,9 @@
%undefine with_filter
%endif
+%define orgname php
+%define php_suffix 54
+
%define rel 0.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
@@ -130,73 +133,73 @@
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: php
-Version: 5.4.3
+Name: %{orgname}%{php_suffix}
+Version: 5.4.4
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
-Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 51f9488bf8682399b802c48656315cac
-Source2: %{name}-mod_%{name}.conf
-Source3: %{name}-cgi-fcgi.ini
-Source4: %{name}-apache.ini
-Source5: %{name}-cli.ini
+Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
+# Source0-md5: 1fd98dc3f6f3805cd67bff12a26ed77f
+Source2: %{orgname}-mod_%{orgname}.conf
+Source3: %{orgname}-cgi-fcgi.ini
+Source4: %{orgname}-apache.ini
+Source5: %{orgname}-cli.ini
# Taken from: http://browsers.garykeith.com/downloads.asp
-Source9: %{name}_browscap.ini
-Source10: %{name}-fpm.init
-Source11: %{name}-fpm.logrotate
-Source12: %{name}-branch.sh
+Source9: %{orgname}_browscap.ini
+Source10: %{orgname}-fpm.init
+Source11: %{orgname}-fpm.logrotate
+Source12: %{orgname}-branch.sh
Source13: dep-tests.sh
Source14: skip-tests.sh
# Source15Download: http://litespeedtech.com/lsapi-downloads.html
-Source15: http://litespeedtech.com/packages/lsapi/%{name}-litespeed-%{litespeed_version}.tgz
+Source15: http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz
# Source15-md5: 9d58485d5fd6b5f5fefcec41b9ce283e
-Patch0: %{name}-shared.patch
-Patch1: %{name}-pldlogo.patch
-Patch2: %{name}-mail.patch
-Patch3: %{name}-link-libs.patch
-Patch4: %{name}-libpq_fs_h_path.patch
-Patch5: %{name}-filter-shared.patch
-Patch6: %{name}-build_modules.patch
-Patch7: %{name}-sapi-ini-file.patch
-Patch8: %{name}-config-file-scan-dir.patch
-Patch9: %{name}-sh.patch
-Patch10: %{name}-ini.patch
+Patch0: %{orgname}-shared.patch
+Patch1: %{orgname}-pldlogo.patch
+Patch2: %{orgname}-mail.patch
+Patch3: %{orgname}-link-libs.patch
+Patch4: %{orgname}-libpq_fs_h_path.patch
+Patch5: %{orgname}-filter-shared.patch
+Patch6: %{orgname}-build_modules.patch
+Patch7: %{orgname}-sapi-ini-file.patch
+Patch8: %{orgname}-config-file-scan-dir.patch
+Patch9: %{orgname}-sh.patch
+Patch10: %{orgname}-ini.patch
Patch11: embed.patch
%if %{with type_hints}
Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
%endif
-Patch14: %{name}-no_pear_install.patch
-#Patch15: %{name}-zlib.patch # no longer needed?
-Patch17: %{name}-readline.patch
-Patch18: %{name}-nohttpd.patch
-Patch19: %{name}-gd_imagerotate_enable.patch
-Patch20: %{name}-uint32_t.patch
-Patch21: %{name}-dba-link.patch
-Patch22: %{name}-both-apxs.patch
-Patch23: %{name}-builddir.patch
-Patch24: %{name}-zlib-for-getimagesize.patch
-Patch25: %{name}-stupidapache_version.patch
-Patch26: %{name}-pear.patch
-Patch27: %{name}-config-dir.patch
-Patch29: %{name}-fcgi-graceful.patch
-Patch31: %{name}-fcgi-error_log-no-newlines.patch
-#Patch32: %{name}-curl-limit-speed.patch # applied upstream
-Patch34: %{name}-libtool.patch
-Patch35: %{name}-tds.patch
-Patch36: %{name}-mysql-charsetphpini.patch
-Patch37: %{name}-mysqli-charsetphpini.patch
-Patch38: %{name}-pdo_mysql-charsetphpini.patch
-Patch39: %{name}-use-prog_sendmail.patch
-Patch41: %{name}-fpm-config.patch
-Patch42: %{name}-fpm-shared.patch
-Patch43: %{name}-silent-session-cleanup.patch
-Patch44: %{name}-include_path.patch
-Patch45: %{name}-imap-annotations.patch
-Patch46: %{name}-imap-myrights.patch
+Patch14: %{orgname}-no_pear_install.patch
+#Patch15: %{orgname}-zlib.patch # no longer needed?
+Patch17: %{orgname}-readline.patch
+Patch18: %{orgname}-nohttpd.patch
+Patch19: %{orgname}-gd_imagerotate_enable.patch
+Patch20: %{orgname}-uint32_t.patch
+Patch21: %{orgname}-dba-link.patch
+Patch22: %{orgname}-both-apxs.patch
+Patch23: %{orgname}-builddir.patch
+Patch24: %{orgname}-zlib-for-getimagesize.patch
+Patch25: %{orgname}-stupidapache_version.patch
+Patch26: %{orgname}-pear.patch
+Patch27: %{orgname}-config-dir.patch
+Patch29: %{orgname}-fcgi-graceful.patch
+Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
+#Patch32: %{orgname}-curl-limit-speed.patch # applied upstream
+Patch34: %{orgname}-libtool.patch
+Patch35: %{orgname}-tds.patch
+Patch36: %{orgname}-mysql-charsetphpini.patch
+Patch37: %{orgname}-mysqli-charsetphpini.patch
+Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
+Patch39: %{orgname}-use-prog_sendmail.patch
+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
-#Patch49: %{name}-m4-divert.patch # no longer needed, upstream supports new ac
+#Patch49: %{orgname}-m4-divert.patch # no longer needed, upstream supports new ac
Patch50: extension-shared-optional-dep.patch
Patch51: spl-shared.patch
Patch52: pcre-shared.patch
@@ -204,12 +207,12 @@
#Patch54: mysqlnd-shared.patch # shared build supported upstream
Patch55: bug-52078-fileinode.patch
#Patch57: bug-52448.patch # outdated
-Patch59: %{name}-systzdata.patch
-Patch60: %{name}-oracle-instantclient.patch
-#Patch61: %{name}-krb5-ac.patch # not needed on 5.4 anymore
+Patch59: %{orgname}-systzdata.patch
+Patch60: %{orgname}-oracle-instantclient.patch
+#Patch61: %{orgname}-krb5-ac.patch # not needed on 5.4 anymore
Patch62: mcrypt-libs.patch
-Patch63: %{name}-mysql-nowarning.patch
-#Patch64: %{name}-m4.patch # not needed on 5.4 branch
+Patch63: %{orgname}-mysql-nowarning.patch
+#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch
# http://spot.fedorapeople.org/php-5.3.6-libzip.patch
Patch65: system-libzip.patch
URL: http://www.php.net/
@@ -384,7 +387,7 @@
роботи з базами даних є доволі простим. Найбільш популярне
використання PHP - заміна для CGI скриптів.
-%package -n apache1-mod_php
+%package -n apache1-mod_php%{php_suffix}
Summary: PHP DSO module for Apache 1.3.x
Summary(pl.UTF-8): Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
Group: Development/Languages/PHP
@@ -396,13 +399,13 @@
Obsoletes: apache-mod_php < 1:4.1.1
Obsoletes: phpfi
-%description -n apache1-mod_php
+%description -n apache1-mod_php%{php_suffix}
PHP as DSO module for Apache 1.3.x.
-%description -n apache1-mod_php -l pl.UTF-8
+%description -n apache1-mod_php%{php_suffix} -l pl.UTF-8
PHP jako moduł DSO (Dynamic Shared Object) dla Apache 1.3.x.
-%package -n apache-mod_php
+%package -n apache-mod_php%{php_suffix}
Summary: PHP DSO module for Apache 2.x
Summary(pl.UTF-8): Moduł DSO (Dynamic Shared Object) PHP dla Apache 2.x
Group: Development/Languages/PHP
@@ -412,10 +415,10 @@
Provides: webserver(php) = %{version}
Obsoletes: phpfi
-%description -n apache-mod_php
+%description -n apache-mod_php%{php_suffix}
PHP as DSO module for Apache 2.x.
-%description -n apache-mod_php -l pl.UTF-8
+%description -n apache-mod_php%{php_suffix} -l pl.UTF-8
PHP jako moduł DSO (Dynamic Shared Object) dla Apache 2.x.
%package litespeed
@@ -1855,7 +1858,7 @@
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q
+%setup -q -n %{orgname}-%{version}
# prep for suhosin patch
%undos Zend/Zend.dsp Zend/ZendTS.dsp
%patch0 -p1
@@ -2466,22 +2469,22 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n apache1-mod_php
+%post -n apache1-mod_php%{php_suffix}
if [ "$1" = "1" ]; then
%service -q apache restart
fi
-%postun -n apache1-mod_php
+%postun -n apache1-mod_php%{php_suffix}
if [ "$1" = "0" ]; then
%service -q apache restart
fi
-%post -n apache-mod_php
+%post -n apache-mod_php%{php_suffix}
if [ "$1" = "1" ]; then
%service -q httpd restart
fi
-%postun -n apache-mod_php
+%postun -n apache-mod_php%{php_suffix}
if [ "$1" = "0" ]; then
%service -q httpd restart
fi
@@ -2532,7 +2535,7 @@
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
%if %{with apache1}
-%triggerpostun -n apache1-mod_php -- php < 4:5.0.4-9.11
+%triggerpostun -n apache1-mod_php%{php_suffix} -- php < 4:5.0.4-9.11
sed -i -e '
/^AddType application\/x-httpd-php \.php/s,^,#,
/^\(Add\|Load\)Module.*php5\.\(so\|c\)/d
@@ -2541,7 +2544,7 @@
%endif
%if %{with apache2}
-%triggerpostun -n apache-mod_php -- php < 4:5.0.4-7.1
+%triggerpostun -n apache-mod_php%{php_suffix} -- php < 4:5.0.4-7.1
# for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
@@ -2628,76 +2631,76 @@
%extension_scripts zip
%extension_scripts zlib
-%triggerun bcmath -- %{name}-bcmath < 4:5.0.4-9.1
+%triggerun bcmath -- %{orgname}-bcmath < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bcmath\.so/d' %{_sysconfdir}/php.ini
-%triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1
+%triggerun calendar -- %{orgname}-calendar < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*calendar\.so/d' %{_sysconfdir}/php.ini
-%triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1
+%triggerun ctype -- %{orgname}-ctype < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ctype\.so/d' %{_sysconfdir}/php.ini
-%triggerun curl -- %{name}-curl < 4:5.0.4-9.1
+%triggerun curl -- %{orgname}-curl < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*curl\.so/d' %{_sysconfdir}/php.ini
-%triggerun dba -- %{name}-dba < 4:5.0.4-9.1
+%triggerun dba -- %{orgname}-dba < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dba\.so/d' %{_sysconfdir}/php.ini
-%triggerun dom -- %{name}-dom < 4:5.0.4-9.1
+%triggerun dom -- %{orgname}-dom < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dom\.so/d' %{_sysconfdir}/php.ini
-%triggerun exif -- %{name}-exif < 4:5.0.4-9.1
+%triggerun exif -- %{orgname}-exif < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*exif\.so/d' %{_sysconfdir}/php.ini
-%triggerun ftp -- %{name}-ftp < 4:5.0.4-9.1
+%triggerun ftp -- %{orgname}-ftp < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ftp\.so/d' %{_sysconfdir}/php.ini
-%triggerun gd -- %{name}-gd < 4:5.0.4-9.1
+%triggerun gd -- %{orgname}-gd < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gd\.so/d' %{_sysconfdir}/php.ini
-%triggerun gettext -- %{name}-gettext < 4:5.0.4-9.1
+%triggerun gettext -- %{orgname}-gettext < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gettext\.so/d' %{_sysconfdir}/php.ini
-%triggerun gmp -- %{name}-gmp < 4:5.0.4-9.1
+%triggerun gmp -- %{orgname}-gmp < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gmp\.so/d' %{_sysconfdir}/php.ini
-%triggerun iconv -- %{name}-iconv < 4:5.0.4-9.1
+%triggerun iconv -- %{orgname}-iconv < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*iconv\.so/d' %{_sysconfdir}/php.ini
-%triggerun imap -- %{name}-imap < 4:5.0.4-9.1
+%triggerun imap -- %{orgname}-imap < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*imap\.so/d' %{_sysconfdir}/php.ini
-%triggerun interbase -- %{name}-interbase < 4:5.0.4-9.1
+%triggerun interbase -- %{orgname}-interbase < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*interbase\.so/d' %{_sysconfdir}/php.ini
-%triggerun ldap -- %{name}-ldap < 4:5.0.4-9.1
+%triggerun ldap -- %{orgname}-ldap < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ldap\.so/d' %{_sysconfdir}/php.ini
-%triggerun mbstring -- %{name}-mbstring < 4:5.0.4-9.1
+%triggerun mbstring -- %{orgname}-mbstring < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mbstring\.so/d' %{_sysconfdir}/php.ini
-%triggerun mcrypt -- %{name}-mcrypt < 4:5.0.4-9.1
+%triggerun mcrypt -- %{orgname}-mcrypt < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mcrypt\.so/d' %{_sysconfdir}/php.ini
-%triggerun mssql -- %{name}-mssql < 4:5.0.4-9.1
+%triggerun mssql -- %{orgname}-mssql < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mssql\.so/d' %{_sysconfdir}/php.ini
-%triggerun mysql -- %{name}-mysql < 4:5.0.4-9.1
+%triggerun mysql -- %{orgname}-mysql < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysql\.so/d' %{_sysconfdir}/php.ini
-%triggerun mysqli -- %{name}-mysqli < 4:5.0.4-9.1
+%triggerun mysqli -- %{orgname}-mysqli < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysqli\.so/d' %{_sysconfdir}/php.ini
-%triggerun oci8 -- %{name}-oci8 < 4:5.0.4-9.1
+%triggerun oci8 -- %{orgname}-oci8 < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*oci8\.so/d' %{_sysconfdir}/php.ini
-%triggerun odbc -- %{name}-odbc < 4:5.0.4-9.1
+%triggerun odbc -- %{orgname}-odbc < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*odbc\.so/d' %{_sysconfdir}/php.ini
-%triggerun openssl -- %{name}-openssl < 4:5.0.4-9.1
+%triggerun openssl -- %{orgname}-openssl < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*openssl\.so/d' %{_sysconfdir}/php.ini
-%triggerun pcntl -- %{name}-pcntl < 4:5.1.2-9.5
+%triggerun pcntl -- %{orgname}-pcntl < 4:5.1.2-9.5
if [ -f %{_sysconfdir}/php-cgi.ini ]; then
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cgi.ini
fi
@@ -2705,19 +2708,19 @@
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cli.ini
fi
-%triggerun pcre -- %{name}-pcre < 4:5.0.4-9.1
+%triggerun pcre -- %{orgname}-pcre < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcre\.so/d' %{_sysconfdir}/php.ini
-%triggerun pgsql -- %{name}-pgsql < 4:5.0.4-9.1
+%triggerun pgsql -- %{orgname}-pgsql < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pgsql\.so/d' %{_sysconfdir}/php.ini
-%triggerun posix -- %{name}-posix < 4:5.0.4-9.1
+%triggerun posix -- %{orgname}-posix < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*posix\.so/d' %{_sysconfdir}/php.ini
-%triggerun pspell -- %{name}-pspell < 4:5.0.4-9.1
+%triggerun pspell -- %{orgname}-pspell < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pspell\.so/d' %{_sysconfdir}/php.ini
-%triggerun readline -- %{name}-readline < 4:5.1.2-9.5
+%triggerun readline -- %{orgname}-readline < 4:5.1.2-9.5
if [ -f %{_sysconfdir}/php-cgi.ini ]; then
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*readline\.so/d' %{_sysconfdir}/php-cgi.ini
fi
@@ -2725,56 +2728,56 @@
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*readline\.so/d' %{_sysconfdir}/php-cli.ini
fi
-%triggerun recode -- %{name}-recode < 4:5.0.4-9.1
+%triggerun recode -- %{orgname}-recode < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*recode\.so/d' %{_sysconfdir}/php.ini
-%triggerun session -- %{name}-session < 4:5.0.4-9.1
+%triggerun session -- %{orgname}-session < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*session\.so/d' %{_sysconfdir}/php.ini
-%triggerun shmop -- %{name}-shmop < 4:5.0.4-9.1
+%triggerun shmop -- %{orgname}-shmop < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*shmop\.so/d' %{_sysconfdir}/php.ini
-%triggerun snmp -- %{name}-snmp < 4:5.0.4-9.1
+%triggerun snmp -- %{orgname}-snmp < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*snmp\.so/d' %{_sysconfdir}/php.ini
-%triggerun soap -- %{name}-soap < 4:5.0.4-9.1
+%triggerun soap -- %{orgname}-soap < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*soap\.so/d' %{_sysconfdir}/php.ini
-%triggerun sockets -- %{name}-sockets < 4:5.0.4-9.1
+%triggerun sockets -- %{orgname}-sockets < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sockets\.so/d' %{_sysconfdir}/php.ini
-%triggerun sybase-ct -- %{name}-sybase-ct < 4:5.0.4-9.1
+%triggerun sybase-ct -- %{orgname}-sybase-ct < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sybase-ct\.so/d' %{_sysconfdir}/php.ini
-%triggerun sysvmsg -- %{name}-sysvmsg < 4:5.0.4-9.1
+%triggerun sysvmsg -- %{orgname}-sysvmsg < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvmsg\.so/d' %{_sysconfdir}/php.ini
-%triggerun sysvsem -- %{name}-sysvsem < 4:5.0.4-9.1
+%triggerun sysvsem -- %{orgname}-sysvsem < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvsem\.so/d' %{_sysconfdir}/php.ini
-%triggerun sysvshm -- %{name}-sysvshm < 4:5.0.4-9.1
+%triggerun sysvshm -- %{orgname}-sysvshm < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvshm\.so/d' %{_sysconfdir}/php.ini
-%triggerun tidy -- %{name}-tidy < 4:5.0.4-9.1
+%triggerun tidy -- %{orgname}-tidy < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*tidy\.so/d' %{_sysconfdir}/php.ini
-%triggerun wddx -- %{name}-wddx < 4:5.0.4-9.1
+%triggerun wddx -- %{orgname}-wddx < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*wddx\.so/d' %{_sysconfdir}/php.ini
-%triggerun xml -- %{name}-xml < 4:5.0.4-9.1
+%triggerun xml -- %{orgname}-xml < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xml\.so/d' %{_sysconfdir}/php.ini
-%triggerun xmlrpc -- %{name}-xmlrpc < 4:5.0.4-9.1
+%triggerun xmlrpc -- %{orgname}-xmlrpc < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xmlrpc\.so/d' %{_sysconfdir}/php.ini
-%triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1
+%triggerun xsl -- %{orgname}-xsl < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xsl\.so/d' %{_sysconfdir}/php.ini
-%triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1
+%triggerun zlib -- %{orgname}-zlib < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*zlib\.so/d' %{_sysconfdir}/php.ini
%if %{with apache1}
-%files -n apache1-mod_php
+%files -n apache1-mod_php%{php_suffix}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
@@ -2783,7 +2786,7 @@
%endif
%if %{with apache2}
-%files -n apache-mod_php
+%files -n apache-mod_php%{php_suffix}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
@@ -3218,6 +3221,7 @@
%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
@@ -3292,6 +3296,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.945.2.17 2012/07/02 15:49:58 glen
+- up to 5.4.4, use php54 as package basename
+
Revision 1.945.2.16 2012/07/02 15:06:25 glen
- 5.4.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/php/php.spec?r1=1.945.2.16&r2=1.945.2.17
More information about the pld-cvs-commit
mailing list