X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=9ae9d197beac89829f0632cdf596ea79f5b7424d;hb=529e9ea30ed9448351ed1c81a024dcd4add200d1;hp=8db1c5894510f97d8dc3ae348426b43851c9b923;hpb=a3c070008e4e2f6e5079a877190312b0f8755886;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index 8db1c58..9ae9d19 100644 --- a/php.spec +++ b/php.spec @@ -8,8 +8,14 @@ # - dba: enable: --with-tcadb=DIR DBA: Tokyo Cabinet abstract DB support # --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory BUNDLED # --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. -# - recheck: define PDO_MYSQL_UNIX_ADDR (ensure if's correct with mysql-libs and mysqlng) # - uses libvpx for webp support, should use libwebp-devel instead? +# - fpm -qn check fails, as it still loads /etc/php/php.ini +# - co-install with php 5.3: +# file /etc/rc.d/init.d/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/sbin/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/share/man/man8/php-fpm.8.gz from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/bin/php.cli from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 +# file /usr/share/man/man1/php.1.gz from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 # NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/) # UNPACKAGED EXTENSION NOTES: # - com_dotnet is Win32-only @@ -125,7 +131,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %define orgname php %define php_suffix 54 -%define rel 0.1 +%define rel 0.15 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -133,13 +139,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.4 +Version: 5.4.5 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: 1fd98dc3f6f3805cd67bff12a26ed77f +# Source0-md5: ffcc7f4dcf2b79d667fe0c110e6cb724 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -230,7 +236,7 @@ BuildRequires: elfutils-devel #BuildRequires: flex %{?with_kerberos5:BuildRequires: heimdal-devel} %{?with_system_libzip:BuildRequires: libzip-devel >= 0.10-3} -BuildRequires: mysql-devel +%{!?with_mysqlnd:BuildRequires: mysql-devel} BuildRequires: pkgconfig BuildRequires: sed >= 4.0 %if %{with mssql} || %{with sybase_ct} @@ -301,8 +307,8 @@ BuildRequires: libevent-devel >= 1.4.7-3 %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define php_sysconfdir /etc/php -%define php_extensiondir %{_libdir}/php +%define php_sysconfdir /etc/%{name} +%define php_extensiondir %{_libdir}/%{name} %define _sysconfdir %{php_sysconfdir} # must be in sync with source. extra check ensuring that it is so is done in %%build @@ -319,7 +325,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver 1.2.1 %define pharver 2.0.1 %define sqlite3ver 0.7 -%define zipver 1.9.1 +%define zipver 1.11.0 %define zend_zts %{!?with_zts:0}%{?with_zts:1} %define php_debug %{!?debug:0}%{?debug:1} @@ -386,7 +392,7 @@ PHP - це мова написання скриптів, що вбудовуют роботи з базами даних є доволі простим. Найбільш популярне використання PHP - заміна для CGI скриптів. -%package -n apache1-mod_php%{php_suffix} +%package -n apache1-mod_%{name} 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 @@ -398,13 +404,13 @@ Provides: webserver(php) = %{version} Obsoletes: apache-mod_php < 1:4.1.1 Obsoletes: phpfi -%description -n apache1-mod_php%{php_suffix} +%description -n apache1-mod_%{name} PHP as DSO module for Apache 1.3.x. -%description -n apache1-mod_php%{php_suffix} -l pl.UTF-8 +%description -n apache1-mod_%{name} -l pl.UTF-8 PHP jako moduł DSO (Dynamic Shared Object) dla Apache 1.3.x. -%package -n apache-mod_php%{php_suffix} +%package -n apache-mod_%{name} 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 @@ -414,10 +420,10 @@ Requires: apache-mod_mime Provides: webserver(php) = %{version} Obsoletes: phpfi -%description -n apache-mod_php%{php_suffix} +%description -n apache-mod_%{name} PHP as DSO module for Apache 2.x. -%description -n apache-mod_php%{php_suffix} -l pl.UTF-8 +%description -n apache-mod_%{name} -l pl.UTF-8 PHP jako moduł DSO (Dynamic Shared Object) dla Apache 2.x. %package litespeed @@ -464,6 +470,7 @@ PHP jako interpreter działający z linii poleceń. %package embedded Summary: PHP library for embedding in applications +Summary(pl.UTF-8): Biblioteka PHP do osadzania w aplikacjach Group: Libraries Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -471,6 +478,10 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} The php-embedded package contains a library which can be embedded into applications to provide PHP scripting language support. +%description embedded -l pl.UTF-8 +Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w +celu obsługi PHP jako języka skryptowego. + %package program Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php @@ -569,8 +580,10 @@ Requires: libtool %endif %{?with_pcre:Requires: pcre-devel >= 8.10} Requires: shtool +Obsoletes: php-devel Obsoletes: php-pear-devel Obsoletes: php4-devel +Obsoletes: php52-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. @@ -2153,7 +2166,7 @@ for sapi in $sapis; do %endif %{?with_mhash:--with-mhash=yes} \ --with-mysql-sock=/var/lib/mysql/mysql.sock \ - --with-pdo-mysql=shared%{?with_mysqlnd:,mysqlnd} \ + --with-pdo-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \ %{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ %{?with_pgsql:--with-pdo-pgsql=shared} \ @@ -2191,9 +2204,9 @@ for sapi in $sapis; do --with-mcrypt=shared \ %{?with_mm:--with-mm} \ %{?with_mssql:--with-mssql=shared} \ - %{?with_mysqlnd:--with-mysqlnd=shared} \ - --with-mysql=shared%{?with_mysqlnd:,mysqlnd} \ - %{?with_mysqli:--with-mysqli=shared%{?with_mysqlnd:,mysqlnd}} \ + %{?with_mysqlnd:--enable-mysqlnd=shared} \ + --with-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \ + %{?with_mysqli:--with-mysqli=shared,%{!?with_mysqlnd:/usr/bin/mysql_config}%{?with_mysqlnd:mysqlnd}} \ %{?with_oci8:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ %{?with_openssl:--with-openssl=shared} \ %{?with_kerberos5:--with-kerberos} \ @@ -2229,8 +2242,8 @@ for sapi in $sapis; do done # as we build each SAPI in own make, adjust php-config.in forehead -sapis=$(awk '/^PHP_SAPI = /{print $3}' Makefile.* | sort -u | xargs) -sed -i -e "s,@PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in" +sapis=$(%{__sed} -rne 's/^PHP_INSTALLED_SAPIS = (.+)/\1/p' Makefile.* | tr ' ' '\n' | sort -u | xargs) +%{__sed} -i -e "s,@PHP_INSTALLED_SAPIS@,$sapis," scripts/php-config.in # must make libphp_common first, so modules can link against it. cp -af php_config.h.cli main/php_config.h @@ -2254,20 +2267,21 @@ cp -af Makefile.cli Makefile %if %{with cgi} cp -pf php_config.h.cgi-fcgi main/php_config.h %{__make} -f Makefile.cgi-fcgi -[ "$(echo ' /dev/null +./sapi/fpm/php-fpm -n -m +[ $(./sapi/fpm/php-fpm -n -m | grep cgi-fcgi) = "cgi-fcgi" ] %endif # CLI cp -pf php_config.h.cli main/php_config.h %{__make} -f Makefile.cli -[ "$(echo '<", $vals, $index); exit((int )empty($vals[0]["value"]));' @@ -2369,7 +2383,7 @@ libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT # install litespeed sapi %if %{with litespeed} -libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/php.litespeed +libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/%{name}.litespeed %endif libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir} @@ -2377,21 +2391,26 @@ libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir} # install CGI/FCGI %if %{with cgi} # install-cgi -libtool --mode=install install -p sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.cgi -ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi +libtool --mode=install install -p sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.cgi +ln -sf %{name}.cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.fcgi cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini %endif # install FCGI PM %if %{with fpm} install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}} -libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir} -cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8 +libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}/%{name}-fpm +cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8 cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir} install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm +install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm +%{__sed} -i -e ' + s#/usr/lib/php#%{php_extensiondir}# + s#/etc/php#%{_sysconfdir}# + s#@processname@#%{name}-fpm#g +' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf install -d $RPM_BUILD_ROOT/etc/logrotate.d -cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/php-fpm +cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm %endif # install Embedded API @@ -2403,12 +2422,12 @@ cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %endif # install CLI -libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli -cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1 -echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1 -ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php +libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{name} +cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +echo ".so %{name}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 +ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/php -sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini @@ -2425,6 +2444,13 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la %endif +# ensure that paths are correct for current php version and arch +grep -El '/etc/php/|/usr/lib/php/' %{_sysconfdir}/*.ini | xargs -r \ +%{__sed} -i -e ' + s#/usr/lib/php#%{php_extensiondir}# + s#/etc/php#%{_sysconfdir}# +' + install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d @@ -2468,22 +2494,22 @@ sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_lib %clean rm -rf $RPM_BUILD_ROOT -%post -n apache1-mod_php%{php_suffix} +%post -n apache1-mod_%{name} if [ "$1" = "1" ]; then %service -q apache restart fi -%postun -n apache1-mod_php%{php_suffix} +%postun -n apache1-mod_%{name} if [ "$1" = "0" ]; then %service -q apache restart fi -%post -n apache-mod_php%{php_suffix} +%post -n apache-mod_%{name} if [ "$1" = "1" ]; then %service -q httpd restart fi -%postun -n apache-mod_php%{php_suffix} +%postun -n apache-mod_%{name} if [ "$1" = "0" ]; then %service -q httpd restart fi @@ -2492,13 +2518,13 @@ fi %useradd -u 51 -r -s /bin/false -c "HTTP User" -g http http %post fpm -/sbin/chkconfig --add php-fpm -%service php-fpm restart +/sbin/chkconfig --add %{name}-fpm +%service %{name}-fpm restart %preun fpm if [ "$1" = 0 ]; then - %service php-fpm stop - /sbin/chkconfig --del php-fpm + %service %{name}-fpm stop + /sbin/chkconfig --del %{name}-fpm fi %postun fpm @@ -2533,24 +2559,6 @@ fi [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart -%if %{with apache1} -%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 -' /etc/apache/apache.conf -%service -q apache restart -%endif - -%if %{with apache2} -%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} - mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini -fi -%endif - # common macros called at extension post/postun scriptlet %define extension_scripts() \ %post %1 \ @@ -2597,19 +2605,23 @@ fi %extension_scripts odbc %extension_scripts openssl %extension_scripts pcre +%extension_scripts pdo %extension_scripts pdo-dblib %extension_scripts pdo-firebird +%extension_scripts pdo-oci %extension_scripts pdo-mysql %extension_scripts pdo-odbc %extension_scripts pdo-pgsql %extension_scripts pdo-sqlite %extension_scripts pgsql %extension_scripts phar +%extension_scripts pcntl %extension_scripts posix %extension_scripts pspell %extension_scripts recode %extension_scripts session %extension_scripts shmop +%extension_scripts simplexml %extension_scripts snmp %extension_scripts soap %extension_scripts sockets @@ -2630,153 +2642,8 @@ fi %extension_scripts zip %extension_scripts zlib -%triggerun bcmath -- %{orgname}-bcmath < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bcmath\.so/d' %{_sysconfdir}/php.ini - -%triggerun calendar -- %{orgname}-calendar < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*calendar\.so/d' %{_sysconfdir}/php.ini - -%triggerun ctype -- %{orgname}-ctype < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ctype\.so/d' %{_sysconfdir}/php.ini - -%triggerun curl -- %{orgname}-curl < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*curl\.so/d' %{_sysconfdir}/php.ini - -%triggerun dba -- %{orgname}-dba < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dba\.so/d' %{_sysconfdir}/php.ini - -%triggerun dom -- %{orgname}-dom < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dom\.so/d' %{_sysconfdir}/php.ini - -%triggerun exif -- %{orgname}-exif < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*exif\.so/d' %{_sysconfdir}/php.ini - -%triggerun ftp -- %{orgname}-ftp < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ftp\.so/d' %{_sysconfdir}/php.ini - -%triggerun gd -- %{orgname}-gd < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gd\.so/d' %{_sysconfdir}/php.ini - -%triggerun gettext -- %{orgname}-gettext < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gettext\.so/d' %{_sysconfdir}/php.ini - -%triggerun gmp -- %{orgname}-gmp < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gmp\.so/d' %{_sysconfdir}/php.ini - -%triggerun iconv -- %{orgname}-iconv < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*iconv\.so/d' %{_sysconfdir}/php.ini - -%triggerun imap -- %{orgname}-imap < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*imap\.so/d' %{_sysconfdir}/php.ini - -%triggerun interbase -- %{orgname}-interbase < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*interbase\.so/d' %{_sysconfdir}/php.ini - -%triggerun ldap -- %{orgname}-ldap < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ldap\.so/d' %{_sysconfdir}/php.ini - -%triggerun mbstring -- %{orgname}-mbstring < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mbstring\.so/d' %{_sysconfdir}/php.ini - -%triggerun mcrypt -- %{orgname}-mcrypt < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mcrypt\.so/d' %{_sysconfdir}/php.ini - -%triggerun mssql -- %{orgname}-mssql < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mssql\.so/d' %{_sysconfdir}/php.ini - -%triggerun mysql -- %{orgname}-mysql < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysql\.so/d' %{_sysconfdir}/php.ini - -%triggerun mysqli -- %{orgname}-mysqli < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysqli\.so/d' %{_sysconfdir}/php.ini - -%triggerun oci8 -- %{orgname}-oci8 < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*oci8\.so/d' %{_sysconfdir}/php.ini - -%triggerun odbc -- %{orgname}-odbc < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*odbc\.so/d' %{_sysconfdir}/php.ini - -%triggerun openssl -- %{orgname}-openssl < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*openssl\.so/d' %{_sysconfdir}/php.ini - -%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 -if [ -f %{_sysconfdir}/php-cli.ini ]; then - %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cli.ini -fi - -%triggerun pcre -- %{orgname}-pcre < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcre\.so/d' %{_sysconfdir}/php.ini - -%triggerun pgsql -- %{orgname}-pgsql < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pgsql\.so/d' %{_sysconfdir}/php.ini - -%triggerun posix -- %{orgname}-posix < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*posix\.so/d' %{_sysconfdir}/php.ini - -%triggerun pspell -- %{orgname}-pspell < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pspell\.so/d' %{_sysconfdir}/php.ini - -%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 -if [ -f %{_sysconfdir}/php-cli.ini ]; then - %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*readline\.so/d' %{_sysconfdir}/php-cli.ini -fi - -%triggerun recode -- %{orgname}-recode < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*recode\.so/d' %{_sysconfdir}/php.ini - -%triggerun session -- %{orgname}-session < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*session\.so/d' %{_sysconfdir}/php.ini - -%triggerun shmop -- %{orgname}-shmop < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*shmop\.so/d' %{_sysconfdir}/php.ini - -%triggerun snmp -- %{orgname}-snmp < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*snmp\.so/d' %{_sysconfdir}/php.ini - -%triggerun soap -- %{orgname}-soap < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*soap\.so/d' %{_sysconfdir}/php.ini - -%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 -- %{orgname}-sybase-ct < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sybase-ct\.so/d' %{_sysconfdir}/php.ini - -%triggerun sysvmsg -- %{orgname}-sysvmsg < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvmsg\.so/d' %{_sysconfdir}/php.ini - -%triggerun sysvsem -- %{orgname}-sysvsem < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvsem\.so/d' %{_sysconfdir}/php.ini - -%triggerun sysvshm -- %{orgname}-sysvshm < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvshm\.so/d' %{_sysconfdir}/php.ini - -%triggerun tidy -- %{orgname}-tidy < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*tidy\.so/d' %{_sysconfdir}/php.ini - -%triggerun wddx -- %{orgname}-wddx < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*wddx\.so/d' %{_sysconfdir}/php.ini - -%triggerun xml -- %{orgname}-xml < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xml\.so/d' %{_sysconfdir}/php.ini - -%triggerun xmlrpc -- %{orgname}-xmlrpc < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xmlrpc\.so/d' %{_sysconfdir}/php.ini - -%triggerun xsl -- %{orgname}-xsl < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xsl\.so/d' %{_sysconfdir}/php.ini - -%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%{php_suffix} +%files -n apache1-mod_%{name} %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 @@ -2785,7 +2652,7 @@ fi %endif %if %{with apache2} -%files -n apache-mod_php%{php_suffix} +%files -n apache-mod_%{name} %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 @@ -2796,7 +2663,7 @@ fi %if %{with litespeed} %files litespeed %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/php.litespeed +%attr(755,root,root) %{_sbindir}/%{name}.litespeed %endif %if %{with cgi} @@ -2804,8 +2671,8 @@ fi %defattr(644,root,root,755) %dir %{_sysconfdir}/cgi-fcgi.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini -%attr(755,root,root) %{_bindir}/php.cgi -%attr(755,root,root) %{_bindir}/php.fcgi +%attr(755,root,root) %{_bindir}/%{name}.cgi +%attr(755,root,root) %{_bindir}/%{name}.fcgi %endif %if %{with embed} @@ -2818,13 +2685,13 @@ fi %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.cli -%{_mandir}/man1/php.1* -%{_mandir}/man1/php.cli.1* +%attr(755,root,root) %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* %files program %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php +%{_mandir}/man1/php.1* %if %{with fpm} %files fpm @@ -2832,10 +2699,10 @@ fi %doc sapi/fpm/{CREDITS,LICENSE} %dir %{_sysconfdir}/fpm.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf -%attr(755,root,root) %{_sbindir}/php-fpm -%{_mandir}/man8/php-fpm.8* -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm -%attr(754,root,root) /etc/rc.d/init.d/php-fpm +%attr(755,root,root) %{_sbindir}/%{name}-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 %endif %files common