# db, hyperwave, java, mcal, overload, qtdom
# and removed from php 5.1:
# cpdf, fam, yp, oracle
+# and removed from php 5.2:
+# filepro, hw
# - mime_magic can't handle new "string/*" entries in magic.mime
# - make additional headers added by mail patch configurable
# - apply -hardened patch by default ?
%bcond_with db3 # use db3 packages instead of db (4.x) for Berkeley DB support
%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib)
%bcond_with hardening # build with hardening patch applied (http://www.hardened-php.net/)
-%bcond_with hwapi # with Hw API support (BR: proprietary libs)
%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs)
%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs)
%bcond_without curl # without CURL extension module
%bcond_without imap # without IMAP extension module
-%bcond_without interbase # with InterBase extension module
+%bcond_with interbase # with InterBase extension module
%bcond_without ldap # without LDAP extension module
%bcond_without mhash # without mhash extension module
%bcond_without ming # without ming extension module
%bcond_without mm # without mm support for session storage
-%bcond_without msession # without msession extension module
%bcond_without mssql # without MS SQL extension module
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
%bcond_without mime_magic # without mime-magic module
%bcond_without apache2 # disable building apache 2.x module
%bcond_without fcgi # disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
+%bcond_with versioning # build with experimental versioning (to load php4/php5 into same apache)
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-# x86-only lib
-%ifnarch %{ix86}
-%undefine with_msession
-%endif
-
+%define _rel 0.2
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Jêzyk skryptowy PHP
Summary(ru): PHP ÷ÅÒÓÉÉ 5 - ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
Summary(uk): PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
Name: php
-Version: 5.1.2
-%define _rel 7
+Version: 5.2.0
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 79cee17e9db85be878000a2a4198378e
-Source1: FAQ.%{name}
+# Source0-md5: e6029fafcee029edcfa2ceed7a005333
+
Source2: zend.gif
-Source3: %{name}-module-install
-Source4: %{name}-mod_%{name}.conf
-Source5: %{name}-cgi-fcgi.ini
-Source6: %{name}-cgi.ini
-Source7: %{name}-apache.ini
-Source8: %{name}-cli.ini
-Source9: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz
-# Source9-md5: 47a742fa9fab2826ad10c13a2376111a
+Source3: %{name}-mod_%{name}.conf
+Source4: %{name}-cgi-fcgi.ini
+Source5: %{name}-cgi.ini
+Source6: %{name}-apache.ini
+Source7: %{name}-cli.ini
+Source8: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz
+# Source8-md5: 47a742fa9fab2826ad10c13a2376111a
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}-msession-shared-lib.patch
Patch6: %{name}-build_modules.patch
Patch7: %{name}-sapi-ini-file.patch
Patch8: %{name}-no-metaccld.patch
Patch21: %{name}-nohttpd.patch
Patch23: %{name}-gd_imagerotate_enable.patch
Patch24: %{name}-uint32_t.patch
-Patch25: %{name}-hwapi-link.patch
Patch26: %{name}-dba-link.patch
Patch30: %{name}-hardening-fix.patch
Patch31: %{name}-both-apxs.patch
Patch32: %{name}-builddir.patch
Patch33: %{name}-zlib-for-getimagesize.patch
-Patch34: %{name}-ini-search-path.patch
-# Very big hack that is sane only with non-thread MPMs.
-# The case with threaded MPMs is lost even without this hack.
-# http://bugs.php.net/bug.php?id=36152
-Patch35: %{name}-openssl-huge-hack.patch
+Patch35: %{name}-versioning.patch
+Patch36: %{name}-linkflags-clean.patch
+Patch38: %{name}-amd64.patch
+Patch39: %{name}-pear.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}
BuildRequires: libtool >= 1.4.3
BuildRequires: libwrap-devel
BuildRequires: libxml2-devel >= 2.5.10
-BuildRequires: libxslt-devel >= 1.0.18
+BuildRequires: libxslt-devel >= 1.1.0
%{?with_mhash:BuildRequires: mhash-devel}
-%{?with_ming:BuildRequires: ming-devel >= 0.1.0}
+%{?with_ming:BuildRequires: ming-devel >= 0.2a-11}
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
BuildRequires: mysql-devel >= 4.0.0
%{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0}
%if %{with openssl} || %{with ldap}
BuildRequires: openssl-devel >= 0.9.7d
%endif
-BuildRequires: %{__perl}
%{?with_snmp:BuildRequires: net-snmp-devel >= 5.0.7}
BuildRequires: pam-devel
-%{?with_pcre:BuildRequires: pcre-devel}
-%{?with_msession:BuildRequires: phoenix-devel}
+%{?with_pcre:BuildRequires: pcre-devel >= 6.6}
%{?with_pgsql:BuildRequires: postgresql-backend-devel >= 7.2}
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: readline-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/php
-%define _phpsharedir %{_datadir}/php
%define extensionsdir %{_libdir}/php
# must be in sync with source. extra check ensuring that it is so is done in %%build
%define php_api_version 20041225
-%define zend_module_api 20050922
-%define zend_extension_api 220051025
+%define zend_module_api 20060613
+%define zend_extension_api 220060519
%define zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
Summary(pl): Dowi±zanie symboliczne /usr/bin/php
Group: Development/Languages/PHP
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
-Provides: php(program)
-Obsoletes: php(program)
+Obsoletes: /usr/bin/php
%description program
Package providing /usr/bin/php symlink to PHP CLI.
# because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
Requires: glibc >= 6:2.3.5
Requires: php-dirs
-Requires: sed >= 4.0
Provides: %{name}-libxml = %{epoch}:%{version}-%{release}
+Provides: %{name}-overload = %{epoch}:%{version}-%{release}
Provides: %{name}-session = %{epoch}:%{version}-%{release}
Provides: %{name}-simplexml = %{epoch}:%{version}-%{release}
Provides: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: %{name}-standard = %{epoch}:%{version}-%{release}
+%{?with_pcre:Provides: %{name}-pcre = %{epoch}:%{version}-%{release}}
Provides: php(modules_api) = %{php_api_version}
Provides: php(zend_extension_api) = %{zend_extension_api}
Provides: php(zend_module_api) = %{zend_module_api}
Provides: php5(thread-safety) = %{zend_zts}
Obsoletes: php-pecl-domxml
Obsoletes: php-session < 3:4.2.1-2
+Obsoletes: php-pcre < 4:5.2.0
# for the posttrans scriptlet, conflicts because in vserver enviroinment rpm package is not installed.
Conflicts: rpm < 4.4.2-0.2
Modu³ PHP dodaj±cy obs³ugê formularzy PDF poprzez bibliotekê Adobe
FDFTK.
-%package filepro
-Summary: filePro extension module for PHP
-Summary(pl): Modu³ filePro dla PHP
-Group: Libraries
-Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-
-%description filepro
-This is a dynamic shared object (DSO) for PHP that will add support
-for read-only access to filePro databases.
-
-%description filepro -l pl
-Modu³ PHP dodaj±cy mo¿liwo¶æ dostêpu (tylko do odczytu) do baz danych
-filePro.
-
%package ftp
Summary: FTP extension module for PHP
Summary(pl): Modu³ FTP dla PHP
Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki gmp do obliczeñ na
liczbach o dowolnej d³ugo¶ci.
-%package hwapi
-Summary: Hyperwave API extension module for PHP
-Summary(pl): Modu³ API Hyperwave dla PHP
-Group: Libraries
-Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-
-%description hwapi
-This is a dynamic shared object (DSO) for PHP that will add official
-Hyperwave API support.
-
-%description hwapi -l pl
-Modu³ PHP dodaj±cy obs³ugê Hyperwave.
-
%package iconv
Summary: iconv extension module for PHP
Summary(pl): Modu³ iconv dla PHP
Modu³ PHP dodaj±cy obs³ugê plików Flash (.swf) poprzez bibliotekê
ming.
-%package msession
-Summary: msession extension module for PHP
-Summary(pl): Modu³ msession dla PHP
-Group: Libraries
-Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-
-%description msession
-This is a dynamic shared object (DSO) for PHP that will allow you to
-use msession. msession is a high speed session daemon which can run
-either locally or remotely. It is designed to provide consistent
-session management for a PHP web farm.
-
-%description msession -l pl
-Modu³ PHP dodaj±cy umo¿liwiaj±cy korzystanie z demona msession. Jest
-to demon szybkiej obs³ugi sesji, który mo¿e dzia³aæ lokalnie lub na
-innej maszynie. S³u¿y do zapewniania spójnej obs³ugi sesji dla farmy
-serwerów.
-
%package mssql
Summary: MS SQL extension module for PHP
Summary(pl): Modu³ MS SQL dla PHP
Uwaga: to jest modu³ eksperymentalny. Ponadto nie jest przeznaczony do
u¿ywania z serwerem WWW - nie próbuj tego!
-%package pcre
-Summary: PCRE extension module for PHP
-Summary(pl): Modu³ PCRE dla PHP
-Group: Libraries
-Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-
-%description pcre
-This is a dynamic shared object (DSO) for PHP that will add Perl
-Compatible Regular Expression support.
-
-%description pcre -l pl
-Modu³ PHP umo¿liwiaj±cy korzystanie z perlowych wyra¿eñ regularnych
-(Perl Compatible Regular Expressions)
-
%package pdo
Summary: PHP Data Objects (PDO)
Summary(pl): Obs³uga PHP Data Objects (PDO)
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO
%description pdo
This is a dynamic shared object (DSO) for PHP that will add PDO
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_FIREBIRD
%description pdo-firebird
This is a dynamic shared object (DSO) for PHP that will add PDO
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_MYSQL
%description pdo-mysql
This is a dynamic shared object (DSO) for PHP that will add PDO MySQL
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_OCI
%description pdo-oci
This is a dynamic shared object (DSO) for PHP that will add PDO Oracle
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_ODBC
%description pdo-odbc
This is a dynamic shared object (DSO) for PHP that will add PDO ODBC
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_PGSQL
%description pdo-pgsql
This is a dynamic shared object (DSO) for PHP that will add PDO
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Obsoletes: php-pecl-PDO_SQLITE
%description pdo-sqlite
This is a dynamic shared object (DSO) for PHP that will add PDO SQLite
%prep
%setup -q
-# this patch is broken by design, breaks --enable-versioning for example
-# update: --enable-version is broken by itself, it disables dynamic modules.
+%patch36 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
+#%patch9 -p1 # TEST OR UPGRADE
cp php.ini-dist php.ini
%patch10 -p1
# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch23 -p1
+#%patch23 -p1 # UPDATE?
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%if %{with hardening}
-zcat %{SOURCE9} | patch -p1 || exit 1
+zcat %{SOURCE8} | patch -p1 || exit 1
patch -p1 < %{PATCH30} || exit 1
%endif
%patch31 -p1
%patch32 -p1
%patch33 -p1
-%patch34 -p1
-%patch35 -p1
+%{?with_versioning:%patch35 -p1}
+%if "%{_lib}" == "lib64"
+%patch38 -p1
+%endif
+%patch39 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
-# new apr
-sed -i -e 's#apr-config#apr-1-config#g' sapi/apache*/*.m4
-
# remove all bundled libraries not to link with them accidentally
#rm -rf ext/sqlite/libsqlite
#rm -rf ext/bcmath/libbcmath
exit 1
fi
-CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
-%if %{with apache2}
-# Apache2 CFLAGS. harmless for other SAPIs.
-CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --includes) $(%{_bindir}/apu-1-config --includes)"
-%endif
-
EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
rm -f Makefile.{fcgi,cgi,cli,apxs{1,2}} # now remove Makefile copies
;;
esac
` \
+%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
--cache-file=config.cache \
+%endif
--with-libdir=%{_lib} \
--with-config-file-path=%{_sysconfdir} \
--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
--with-flatfile \
--enable-dom=shared \
--enable-exif=shared \
- --enable-filepro=shared \
--enable-ftp=shared \
--enable-gd-native-ttf \
--enable-gd-jus-conf \
%endif
%{?with_fdf:--with-fdftk=shared} \
--with-iconv=shared \
- --with-filepro=shared \
--with-freetype-dir=shared \
--with-gettext=shared \
--with-gd=shared,/usr \
--with-gdbm \
--with-gmp=shared \
- %{?with_hwapi:--with-hwapi=shared} \
%{?with_imap:--with-imap=shared --with-imap-ssl} \
%{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \
--with-jpeg-dir=/usr \
%{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic.mime}%{!?with_mime_magic:--disable-mime-magic} \
%{?with_ming:--with-ming=shared} \
%{?with_mm:--with-mm} \
- %{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \
%{?with_mssql:--with-mssql=shared} \
--with-mysql=shared,/usr \
--with-mysql-sock=/var/lib/mysql/mysql.sock \
%{?with_oci8:--with-oci8=shared} \
%{?with_openssl:--with-openssl=shared} \
--with-kerberos \
- %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared,/usr} \
+ %{!?with_pcre:--without-pcre-regex --disable-filter}%{?with_pcre:--with-pcre-regex=/usr} \
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
--with-png-dir=/usr \
%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
--with-xsl=shared \
--with-zlib=shared \
- --with-zlib-dir=shared,/usr
+ --with-zlib-dir=shared,/usr \
+ --enable-zip=shared,/usr \
cp -f Makefile Makefile.$sapi
cp -f main/php_config.h php_config.h.$sapi
done
-# for now session_mm doesn't work with shared session module...
-# --enable-session=shared
-# %{!?with_mm:--with-mm=shared,no}%{?with_mm:--with-mm=shared}
-
-%{__make} build-modules
-
+# must make this first, so modules can link against it.
%{__make} libphp_common.la
-# fix install paths, avoid evil rpaths
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
+%{__make} build-modules
%if %{with apache1}
%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
-sed -i -e "
-s|^libdir=.*|libdir='%{_libdir}/apache1'|;
-s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache1 |" sapi/apache/libphp5.la
%endif
%if %{with apache2}
%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
-sed -i -e "
-s|^libdir=.*|libdir='%{_libdir}/apache'|;
-s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la
%endif
# FCGI
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}} \
+install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
$RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/httpd.conf} \
$RPM_BUILD_ROOT%{_mandir}/man1 \
+# install the apache modules' files
+%{__make} install-headers install-build install-modules install-programs \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+
# install apache1 DSO module
%if %{with apache1}
-libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/
+libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
%endif
# install apache2 DSO module
%if %{with apache2}
-libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/
+libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
%endif
libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
-
-# install the apache modules' files
-%{__make} install-headers install-build install-modules install-programs \
- INSTALL_ROOT=$RPM_BUILD_ROOT
-
-# as of 5.0.5, phpextdist isn't installed by default
-install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
+# fix install paths, avoid evil rpaths
+sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
+# better solution?
+sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
# install CGI
libtool --silent --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi
install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
-# TODO:
-# Why make install doesn't install libphp5.so ?
-#install libs/libphp5.so $RPM_BUILD_ROOT%{apachelib}
-
ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
%if %{with fcgi}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
%endif
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
-install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE1} .
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
%if %{with apache1}
install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
%endif
%if %{with apache2}
install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
EOF
done
-# Not in all SAPI, so don't need the .ini fragments.
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/{ncurses,pcntl,readline}.ini
+# per SAPI ini directories
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,cgi-fcgi,apache,apache2handler}.d
+
+# for CLI SAPI only
+mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{ncurses,pcntl,readline}.ini,cli.d}
# use system automake and {lib,sh}tool
ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build
ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build
+# as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h
+# isn't installed by install-headers make target, we do it manually here.
+# this header file is required by e.g. filter PECL extension
+install -D ext/pcre/php_pcre.h $RPM_BUILD_ROOT%{_includedir}/php/ext/pcre/php_pcre.h
+
%clean
rm -rf $RPM_BUILD_ROOT
%postun fdf
%extension_postun
-%post filepro
-%extension_post
-
-%postun filepro
-%extension_postun
-
%post ftp
%extension_post
%postun gmp
%extension_postun
-%post hwapi
-%extension_post
-
-%postun hwapi
-%extension_postun
-
%post iconv
%extension_post
%postun ming
%extension_postun
-%post msession
-%extension_post
-
-%postun msession
-%extension_postun
-
%post mssql
%extension_post
%postun mysqli
%extension_postun
-%post ncurses
-if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install install ncurses %{_sysconfdir}/php-cgi.ini
-fi
-if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install install ncurses %{_sysconfdir}/php-cli.ini
-fi
-
-%postun ncurses
-if [ "$1" = "0" ]; then
- if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install remove ncurses %{_sysconfdir}/php-cgi.ini
- fi
- if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install remove ncurses %{_sysconfdir}/php-cli.ini
- fi
-fi
-
%post oci8
%extension_post
%postun openssl
%extension_postun
-%post pcntl
-if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cgi.ini
-fi
-if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cli.ini
-fi
-
-%postun pcntl
-if [ "$1" = "0" ]; then
- if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cgi.ini
- fi
- if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cli.ini
- fi
-fi
-
-%post pcre
-%extension_post
-
-%postun pcre
-%extension_postun
-
%post pdo-dblib
%extension_post
%postun pspell
%extension_postun
-%post readline
-if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install install readline %{_sysconfdir}/php-cgi.ini
-fi
-if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install install readline %{_sysconfdir}/php-cli.ini
-fi
-
-%postun readline
-if [ "$1" = "0" ]; then
- if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{_sbindir}/php-module-install remove readline %{_sysconfdir}/php-cgi.ini
- fi
- if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{_sbindir}/php-module-install remove readline %{_sysconfdir}/php-cli.ini
- fi
-fi
-
%post recode
%extension_post
%postun soap
%extension_postun
-if [ "$1" = "0" ]; then
- %{_sbindir}/php-module-install remove soap %{_sysconfdir}/php.ini
-fi
%post sockets
%extension_post
%extension_postun
%triggerun bcmath -- %{name}-bcmath < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove bcmath %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bcmath\.so/d' %{_sysconfdir}/php.ini
%triggerun bzip2 -- %{name}-bzip2 < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove bzip2 %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bzip2\.so/d' %{_sysconfdir}/php.ini
%triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*calendar\.so/d' %{_sysconfdir}/php.ini
%triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ctype\.so/d' %{_sysconfdir}/php.ini
%triggerun curl -- %{name}-curl < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove curl %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*curl\.so/d' %{_sysconfdir}/php.ini
%triggerun dba -- %{name}-dba < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dba %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dba\.so/d' %{_sysconfdir}/php.ini
%triggerun dbase -- %{name}-dbase < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dbase\.so/d' %{_sysconfdir}/php.ini
%triggerun dom -- %{name}-dom < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dom %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dom\.so/d' %{_sysconfdir}/php.ini
%triggerun exif -- %{name}-exif < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*exif\.so/d' %{_sysconfdir}/php.ini
%triggerun fdf -- %{name}-fdf < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fdf %{_sysconfdir}/php.ini
-
-%triggerun filepro -- %{name}-filepro < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove filepro %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*fdf\.so/d' %{_sysconfdir}/php.ini
%triggerun ftp -- %{name}-ftp < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ftp %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ftp\.so/d' %{_sysconfdir}/php.ini
%triggerun gd -- %{name}-gd < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove gd %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gd\.so/d' %{_sysconfdir}/php.ini
%triggerun gettext -- %{name}-gettext < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove gettext %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gettext\.so/d' %{_sysconfdir}/php.ini
%triggerun gmp -- %{name}-gmp < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove gmp %{_sysconfdir}/php.ini
-
-%triggerun hwapi -- %{name}-hwapi < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove hwapi %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gmp\.so/d' %{_sysconfdir}/php.ini
%triggerun iconv -- %{name}-iconv < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove iconv %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*iconv\.so/d' %{_sysconfdir}/php.ini
%triggerun imap -- %{name}-imap < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove imap %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*imap\.so/d' %{_sysconfdir}/php.ini
%triggerun interbase -- %{name}-interbase < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove interbase %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*interbase\.so/d' %{_sysconfdir}/php.ini
%triggerun ldap -- %{name}-ldap < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ldap %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ldap\.so/d' %{_sysconfdir}/php.ini
%triggerun mbstring -- %{name}-mbstring < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mbstring %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mbstring\.so/d' %{_sysconfdir}/php.ini
%triggerun mcrypt -- %{name}-mcrypt < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mcrypt %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mcrypt\.so/d' %{_sysconfdir}/php.ini
%triggerun mhash -- %{name}-mhash < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mhash %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mhash\.so/d' %{_sysconfdir}/php.ini
%triggerun mime_magic -- %{name}-mime_magic < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mime_magic %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mime_magic\.so/d' %{_sysconfdir}/php.ini
%triggerun ming -- %{name}-ming < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini
-
-%triggerun msession -- %{name}-msession < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ming\.so/d' %{_sysconfdir}/php.ini
%triggerun mssql -- %{name}-mssql < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mssql %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mssql\.so/d' %{_sysconfdir}/php.ini
%triggerun mysql -- %{name}-mysql < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mysql %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysql\.so/d' %{_sysconfdir}/php.ini
+
+%triggerun ncurses -- %{name}-ncurses < 4:5.1.2-9.5
+if [ -f %{_sysconfdir}/php-cgi.ini ]; then
+ %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ncurses\.so/d' %{_sysconfdir}/php-cgi.ini
+fi
+if [ -f %{_sysconfdir}/php-cli.ini ]; then
+ %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ncurses\.so/d' %{_sysconfdir}/php-cli.ini
+fi
%triggerun mysqli -- %{name}-mysqli < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mysqli %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysqli\.so/d' %{_sysconfdir}/php.ini
%triggerun oci8 -- %{name}-oci8 < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove oci8 %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*oci8\.so/d' %{_sysconfdir}/php.ini
%triggerun odbc -- %{name}-odbc < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove odbc %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*odbc\.so/d' %{_sysconfdir}/php.ini
%triggerun openssl -- %{name}-openssl < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove openssl %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*openssl\.so/d' %{_sysconfdir}/php.ini
-%triggerun pcre -- %{name}-pcre < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove pcre %{_sysconfdir}/php.ini
+%triggerun pcntl -- %{name}-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 pgsql -- %{name}-pgsql < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove pgsql %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pgsql\.so/d' %{_sysconfdir}/php.ini
%triggerun posix -- %{name}-posix < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove posix %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*posix\.so/d' %{_sysconfdir}/php.ini
%triggerun pspell -- %{name}-pspell < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove pspell %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pspell\.so/d' %{_sysconfdir}/php.ini
+
+%triggerun readline -- %{name}-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 -- %{name}-recode < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove recode %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*recode\.so/d' %{_sysconfdir}/php.ini
%triggerun session -- %{name}-session < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove session %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*session\.so/d' %{_sysconfdir}/php.ini
%triggerun shmop -- %{name}-shmop < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove shmop %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*shmop\.so/d' %{_sysconfdir}/php.ini
%triggerun snmp -- %{name}-snmp < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove snmp %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*snmp\.so/d' %{_sysconfdir}/php.ini
%triggerun soap -- %{name}-soap < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove soap %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*soap\.so/d' %{_sysconfdir}/php.ini
%triggerun sockets -- %{name}-sockets < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sockets %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sockets\.so/d' %{_sysconfdir}/php.ini
%triggerun sqlite -- %{name}-sqlite < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sqlite %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sqlite\.so/d' %{_sysconfdir}/php.ini
%triggerun sybase -- %{name}-sybase < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sybase %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sybase\.so/d' %{_sysconfdir}/php.ini
%triggerun sybase-ct -- %{name}-sybase-ct < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sybase-ct %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sybase-ct\.so/d' %{_sysconfdir}/php.ini
%triggerun sysvmsg -- %{name}-sysvmsg < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sysvmsg %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvmsg\.so/d' %{_sysconfdir}/php.ini
%triggerun sysvsem -- %{name}-sysvsem < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sysvsem %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvsem\.so/d' %{_sysconfdir}/php.ini
%triggerun sysvshm -- %{name}-sysvshm < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove sysvshm %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvshm\.so/d' %{_sysconfdir}/php.ini
%triggerun tidy -- %{name}-tidy < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove tidy %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*tidy\.so/d' %{_sysconfdir}/php.ini
%triggerun wddx -- %{name}-wddx < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove wddx %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*wddx\.so/d' %{_sysconfdir}/php.ini
%triggerun xml -- %{name}-xml < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xml %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xml\.so/d' %{_sysconfdir}/php.ini
%triggerun xmlrpc -- %{name}-xmlrpc < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xmlrpc %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xmlrpc\.so/d' %{_sysconfdir}/php.ini
%triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xsl %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xsl\.so/d' %{_sysconfdir}/php.ini
%triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*zlib\.so/d' %{_sysconfdir}/php.ini
%if %{with apache1}
%files -n apache1-mod_php
%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
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
%attr(755,root,root) %{_libdir}/apache1/libphp5.so
/home/services/apache/icons/*
%files -n apache-mod_php
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php.conf
+%dir %{_sysconfdir}/apache2handler.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
%attr(755,root,root) %{_libdir}/apache/libphp5.so
/home/services/httpd/icons/*
%files fcgi
%defattr(644,root,root,755)
%doc sapi/cgi/README.FastCGI
-%attr(755,root,root) %{_bindir}/php.fcgi
+%dir %{_sysconfdir}/cgi-fcgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
+%attr(755,root,root) %{_bindir}/php.fcgi
%endif
%files cgi
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/php.cgi
+%dir %{_sysconfdir}/cgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
+%attr(755,root,root) %{_bindir}/php.cgi
%files cli
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/php.cli
+%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*
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%attr(755,root,root) %{_sbindir}/php-module-install
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{extensionsdir}
-%dir %{_phpsharedir}
-# session_mm doesn't work with shared session
-#%files session
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{extensionsdir}/session.so
%doc ext/session/mod_files.sh
%files devel
%doc README.UNIX-BUILD-SYSTEM
%doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
%doc CODING_STANDARDS
-%attr(755,root,root) %{_bindir}/phpextdist
%attr(755,root,root) %{_bindir}/phpize
%attr(755,root,root) %{_bindir}/php-config
%attr(755,root,root) %{_libdir}/libphp_common.so
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini
%attr(755,root,root) %{extensionsdir}/exif.so
-%files filepro
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filepro.ini
-%attr(755,root,root) %{extensionsdir}/filepro.so
-
%files ftp
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini
%attr(755,root,root) %{extensionsdir}/gmp.so
-%if %{with hwapi}
-%files hwapi
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hwapi.ini
-%attr(755,root,root) %{extensionsdir}/hwapi.so
-%endif
-
%files iconv
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini
%attr(755,root,root) %{extensionsdir}/ming.so
%endif
-%if %{with msession}
-%files msession
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini
-%attr(755,root,root) %{extensionsdir}/msession.so
-%endif
-
%if %{with mssql}
%files mssql
%defattr(644,root,root,755)
%files ncurses
%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/ncurses.ini
%attr(755,root,root) %{extensionsdir}/ncurses.so
%if %{with oci8}
%files pcntl
%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/pcntl.ini
%attr(755,root,root) %{extensionsdir}/pcntl.so
-%if %{with pcre}
-%files pcre
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcre.ini
-%attr(755,root,root) %{extensionsdir}/pcre.so
-%endif
-
%files pdo
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini
%files readline
%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini
%attr(755,root,root) %{extensionsdir}/readline.so
%if %{with recode}