]> git.pld-linux.org Git - packages/php.git/blobdiff - php.spec
- added becond:
[packages/php.git] / php.spec
index 79bc65e740bc0500101cc9e018cf5003a0920b94..e214673fbddeaf8bf280e78e4fcb5d1ad5a1fcf3 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -3,6 +3,7 @@
 %include       /usr/lib/rpm/macros.php
 
 %define        _apache2        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
+%define                apxs            /usr/sbin/apxs
 
 %if %{_apache2}
 %define _without_recode 1
 %endif
 
 # Conditional build:
-# _with_cpdf           - with cpdf extension module
-# _with_interbase      - with InterBase extension module
-# _with_java           - with Java extension module
-# _with_oci8           - with Oracle oci8 extension module
-# _with_oracle         - with oracle extension module
-# _with_sybase_ct      - with Sybase-CT extension module
+# _with_interbase      - with InterBase extension module       (BR: proprietary libs)
+# _with_java           - with Java extension module            (BR: jdk)
+# _with_oci8           - with Oracle oci8 extension module     (BR: proprietary libs)
+# _with_oracle         - with oracle extension module          (BR: proprietary libs)
+# _with_pcntl          - with pcntl extension module           (problems: SEGV on exit)
+# _without_cpdf                - without cpdf extension module
 # _without_domxslt     - without DOM XSLT/EXSLT support in DOM XML extension module
+# _without_gif         - build GD extension module with gd library without GIF support
 # _without_imap                - without IMAP extension module
 # _without_ldap                - without LDAP extension module
 # _without_mm          - without mm support for session storage
 # _without_msession    - without msession extension module
 # _without_odbc                - without ODBC extension module
 # _without_openssl     - without OpenSSL support and OpenSSL extension module
+# _without_pcre                - without PCRE extension module
 # _without_pdf         - without PDF extension module
 # _without_snmp                - without SNMP extension module
 # _without_recode      - without recode extension module
+# _without_sybase_ct   - without Sybase-CT extension module
 # _without_wddx                - without WDDX extension module
+# _without_xml         - without XML extension module
+# _without_xmlrpc      - without XML-RPC extension module
 # _without_xslt                - without XSLT extension module
+#
+# _without_curl                - wihtout CURL support 
+# _without_psql                - without PostgreSQL support
+# _without_ming                -
+# _without_mhash       -
+# _without_mnogosearch -
+# _without_pspell      -
+
 Summary:       The PHP HTML-embedded scripting language for use with Apache
 Summary(fr):   Le langage de script embarque-HTML PHP pour Apache
 Summary(pl):   Jêzyk skryptowy PHP -- u¿ywany wraz z serwerem Apache
@@ -39,11 +53,11 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       4.2.2
-Release:       5
+Version:       4.2.3
+Release:       3
 Epoch:         3
 Group:         Libraries
-License:       The PHP license (see "LICENSE" file included in distribution)
+License:       PHP
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 Source1:       FAQ.%{name}
 Source2:       zend.gif
@@ -58,46 +72,47 @@ Patch2:             %{name}-mysql-socket.patch
 Patch3:                %{name}-mail.patch
 Patch4:                %{name}-link-libs.patch
 Patch5:                %{name}-fastcgi.patch
-Patch6:                %{name}-no_php_pcre_in_SAPI_c.patch
-Patch7:                %{name}-libpq_fs_h_path.patch
-Patch8:                %{name}-wddx-fix.patch
-Patch9:                %{name}-cpdf-fix.patch
-Patch10:       %{name}-session-fix-shared.patch
-Patch11:       %{name}-hyperwave-fix.patch
-Patch12:       %{name}-openssl-for-ext-only.patch
-Patch13:       %{name}-java-fix.patch
-Patch14:       %{name}-mcal-shared-lib.patch
-Patch15:       %{name}-msession-shared-lib.patch
-Patch16:       %{name}-xmlrpc-includes.patch
-Patch17:       %{name}-build_modules.patch
-Patch18:       %{name}-sapi-ini-file.patch
-Patch19:       %{name}-apache2_broken_macro.patch
-Patch20:       %{name}-php_iconv_string_declaration.patch
-Patch21:       %{name}-pear-cosmetic.patch
-Patch22:       %{name}-mnogosearch.patch
-Patch23:       %{name}-ini.patch
+Patch6:                %{name}-libpq_fs_h_path.patch
+Patch7:                %{name}-wddx-fix.patch
+Patch8:                %{name}-cpdf-fix.patch
+Patch9:                %{name}-session-fix-shared.patch
+Patch10:       %{name}-hyperwave-fix.patch
+Patch11:       %{name}-openssl-for-ext-only.patch
+Patch12:       %{name}-java-fix.patch
+Patch13:       %{name}-mcal-shared-lib.patch
+Patch14:       %{name}-msession-shared-lib.patch
+Patch15:       %{name}-build_modules.patch
+Patch16:       %{name}-sapi-ini-file.patch
+Patch17:       %{name}-php_iconv_string_declaration.patch
+Patch18:       %{name}-pear-cosmetic.patch
+Patch19:       %{name}-mnogosearch.patch
+Patch20:       %{name}-ini.patch
+Patch21:       %{name}-acam.patch
+Patch22:       %{name}-xmlrpc-fix.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache-devel
-BuildRequires: autoconf >= 2.52
-%{?_with_sybase_ct:BuildRequires:      autoconf >= 2.53}
+BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1.4d
 BuildRequires: bison
 BuildRequires: bzip2-devel
 BuildRequires: cracklib-devel >= 2.7-15
-BuildRequires: curl-devel
+%{!?_without_curl:BuildRequires:       curl-devel}
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel >= 3.1.17
+%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1})
 BuildRequires: expat-devel
+%endif
 BuildRequires: flex
-%{?_with_sybase_ct:BuildRequires:      freetds-devel}
+%{!?_without_sybase_ct:BuildRequires:  freetds-devel}
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: gd-devel >= 2.0.1
+%{!?_without_gif:BuildRequires:        gd-devel(gif)}
 BuildRequires: gdbm-devel
 BuildRequires: gmp-devel
 %{!?_without_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2 }
 %{?_with_java:BuildRequires:   jdk >= 1.1}
-%{?_with_cpdf:BuildRequires:   libcpdf-devel >= 2.02r1-2}
+%{!?_without_cpdf:BuildRequires:       libcpdf-devel >= 2.02r1-2}
 BuildRequires: libjpeg-devel
 BuildRequires: libltdl-devel >= 1.4
 BuildRequires: libmcal-devel
@@ -105,12 +120,12 @@ BuildRequires:    libmcrypt-devel >= 2.4.4
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 0:1.4.2-9
-BuildRequires: libxml2-devel >= 2.2.7
+%{!?_without_xml:BuildRequires:        libxml2-devel >= 2.2.7}
 %{!?_without_domxslt:BuildRequires:    libxslt-devel >= 1.0.3}
-BuildRequires: mhash-devel
-BuildRequires: ming-devel >= 0.1.0
+%{!?_without_mhash:BuildRequires:      mhash-devel}
+%{!?_without_ming:BuildRequires:       ming-devel >= 0.1.0}
 %{!?_without_mm:BuildRequires: mm-devel >= 1.1.3}
-BuildRequires: mnogosearch-devel >= 3.2.6
+%{!?_without_mnogosearch:BuildRequires:        mnogosearch-devel >= 3.2.6}
 BuildRequires: mysql-devel >= 3.23.32
 %{!?_without_ldap:BuildRequires: openldap-devel >= 2.0}
 %if %(expr %{?_without_openssl:0}%{!?_without_openssl:1} + %{?_without_ldap:0}%{!?_without_ldap:1})
@@ -120,16 +135,16 @@ BuildRequires:    pam-devel
 %{!?_without_pdf:BuildRequires:        pdflib-devel >= 4.0.0}
 BuildRequires: perl
 %{!?_without_msession:BuildRequires:   phoenix-devel}
-BuildRequires: postgresql-devel
-BuildRequires: postgresql-backend-devel >= 7.2
-BuildRequires: pspell-devel
+%{!?_without_psql:BuildRequires:       postgresql-devel}
+%{!?_without_psql:BuildRequires:       postgresql-backend-devel >= 7.2}
+%{!?_without_pspell:BuildRequires:     pspell-devel}
 %{!?_without_recode:BuildRequires:     recode-devel >= 3.5d-3}
 BuildRequires: rpm-php-pearprov >= 4.0.2-80
 %{!?_without_xslt:BuildRequires:       sablotron-devel}
 BuildRequires: t1lib-devel
 %{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.3}
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
-BuildRequires: xmlrpc-epi-devel
+%{!?_without_xmlrpc:BuildRequires:     xmlrpc-epi-devel}
 BuildRequires: yaz-devel
 BuildRequires: zip
 BuildRequires: zlib-devel >= 1.0.9
@@ -137,7 +152,8 @@ BuildRequires:      zziplib-devel
 #BuildRequires:        fastcgi-devkit
 # apache 1.3 vs apache 2.0
 %if %{_apache2}
-PreReq:                apache >= 2.0.39
+PreReq:                apache >= 2.0.40
+%requires_eq   apache
 %else
 PreReq:                apache(EAPI) < 2.0.0
 PreReq:                apache(EAPI) >= 1.3.9
@@ -527,7 +543,9 @@ Modu
 Summary:       GD extension module for PHP
 Summary:       Modu³ GD dla PHP
 Group:         Libraries
+%{!?_without_gif:Requires:     gd(gif)}
 PreReq:                %{name}-common = %{version}
+%{!?_without_gif:Provides:     %{name}-gd(gif) = %{epoch}:%{version}}
 
 %description gd
 This is a dynamic shared object (DSO) for Apache that will add GD
@@ -858,7 +876,7 @@ Uwaga: to jest modu
 Summary:       Process Control extension module for PHP
 Summary(pl):   Modu³ Process Control dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+PreReq:                %{name}-cgi = %{version}
 
 %description pcntl
 This is a dynamic shared object (DSO) for Apache that will add process
@@ -1252,11 +1270,12 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+cp php.ini-dist php.ini
 %patch20 -p1
+# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
+# conditionally...
 %patch21 -p1
 %patch22 -p1
-cp php.ini-dist php.ini
-%patch23 -p1
 
 install -d manual
 bzip2 -dc %{SOURCE3} | tar -xf - -C manual
@@ -1295,7 +1314,7 @@ for i in cgi apxs ; do
        --enable-magic-quotes \
        --enable-mbstring=shared --disable-mbstr-enc-trans --enable-mbregex \
        --enable-overload=shared \
-       --disable-pcntl \
+       %{?_with_pcntl:--enable-pcntl=shared}%{!?_with_pcntl:--disable-pcntl} \
        --enable-posix=shared \
        --enable-session \
        --enable-shared \
@@ -1308,19 +1327,23 @@ for i in cgi apxs ; do
        --enable-sockets=shared \
        --enable-ucd-snmp-hack \
        %{!?_without_wddx:--enable-wddx=shared} \
-       --enable-xml=shared \
+       %{?_without_xml:--disable-xml}%{!?_without_xml:--enable-xml=shared} \
        %{!?_without_xslt:--enable-xslt=shared} \
        --enable-yp=shared \
        --with-bz2=shared \
-       %{?_with_cpdf:--with-cpdflib=shared} \
+       %{!?_without_cpdf:--with-cpdflib=shared} \
        --with-crack=shared \
-       --with-curl=shared \
+       %{?_without_curl:--without-curl}%{!?_without_curl:--with-curl=shared} \
        --without-db2 \
        --with-db3 \
        --with-dbase=shared \
        --with-dom=shared \
        %{!?_without_domxslt:--with-dom-xslt=shared --with-dom-exslt=shared} \
+%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1})
        --with-expat-dir=shared,/usr \
+%else
+       --without-expat-dir \
+%endif
        --with-iconv=shared \
        --with-filepro=shared \
        --with-freetype-dir=shared \
@@ -1331,36 +1354,36 @@ for i in cgi apxs ; do
        --with-hyperwave=shared \
        %{!?_without_imap:--with-imap=shared --with-imap-ssl} \
        %{?_with_interbase:--with-interbase=shared} \
-       %{?_with_java:--with-java} \
+       %{?_with_java:--with-java=/usr/lib/java} \
        --with-jpeg-dir=shared,/usr \
        %{!?_without_ldap:--with-ldap=shared} \
        --with-mcal=shared,/usr \
        --with-mcrypt=shared \
-       --with-mhash=shared \
-       --with-ming=shared \
+       %{!?_without_mhash:--with-mhash=shared} \
+       %{!?_without_ming:--with-ming=shared} \
        %{!?_without_mm:--with-mm} \
-       --with-mnogosearch=shared,/usr \
-       %{!?_without_msession:--with-msession=shared} \
+       %{?_without_mnogosearch:--without-mnogosearch}%{!?_without_mnogosearch:--with-mnogosearch=shared,/usr} \
+       %{!?_without_msession:--with-msession=shared}%{?_without_msession:--without-msession} \
        --with-mysql=shared,/usr \
        --with-mysql-sock=/var/lib/mysql/mysql.sock \
        %{?_with_oci8:--with-oci8=shared} \
        %{!?_without_openssl:--with-openssl=shared} \
        %{?_with_oracle:--with-oracle=shared} \
-       --with-pcre-regex=shared \
+       %{?_without_pcre:--without-pcre-regex}%{!?_without_pcre:--with-pcre-regex=shared} \
        %{!?_without_pdf:--with-pdflib=shared} \
        --with-pear=%{php_pear_dir} \
-       --with-pgsql=shared,/usr \
+       %{?_without_psql:--without-pgsql}%{!?_without_psql:--with-pgsql=shared,/usr} \
        --with-png-dir=shared,/usr \
-       --with-pspell=shared \
+       %{!?_without_pspell:--with-pspell=shared} \
        %{!?_without_recode:--with-recode=shared} \
        --with-regex=php \
        --with-sablot-js=shared,no \
        %{!?_without_snmp:--with-snmp=shared} \
-       %{?_with_sybase_ct:--with-sybase-ct=shared,/usr} \
+       %{!?_without_sybase_ct:--with-sybase-ct=shared,/usr} \
        --with-t1lib=shared \
        --with-tiff-dir=shared,/usr \
        %{!?_without_odbc:--with-unixODBC=shared} \
-       --with-xmlrpc=shared,/usr \
+       %{?_without_xmlrpc:--without-xmlrpc}%{!?_without_xmlrpc:--with-xmlrpc=shared,/usr} \
        %{!?_without_xslt:--with-xslt-sablot=shared} \
        --with-yaz=shared \
        --with-zip=shared \
@@ -1372,7 +1395,7 @@ done
 # --enable-session=shared
 # %{?_without_mm:--with-mm=shared,no}%{!?_without_mm:--with-mm=shared}
 
-# TODO --with-pspell=/usr,shared (pspell missing)
+# TODO:
 #      --with-qtdom=shared
 
 %{__make}
@@ -1412,7 +1435,7 @@ install %{SOURCE1} .
 
 mv -f Zend/LICENSE{,.Zend}
 
-mkdir $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Auth_HTTP,Science}
+mkdir $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1421,7 +1444,7 @@ rm -rf $RPM_BUILD_ROOT
 %if ! %{_apache2}
 perl -pi -e 's|^#AddType application/x-httpd-php \.php|AddType application/x-httpd-php .php|' \
        /etc/httpd/httpd.conf
-%{_sbindir}/apxs -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2
+%{apxs} -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2
 %endif
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
@@ -1437,7 +1460,7 @@ fi
 %else
 %preun
 if [ "$1" = "0" ]; then
-       %{_sbindir}/apxs -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2
+       %{apxs} -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2
        perl -pi -e \
                's|^AddType application/x-httpd-php \.php|#AddType application/x-httpd-php .php|' \
                /etc/httpd/httpd.conf
@@ -1747,11 +1770,11 @@ if [ "$1" = "0" ]; then
 fi
 
 %post pcntl
-%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php.ini
+%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cgi.ini
 
 %preun pcntl
 if [ "$1" = "0" ]; then
-       %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php.ini
+       %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cgi.ini
 fi
 
 %post pcre
@@ -1975,7 +1998,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/calendar.so
 
-%if %{?_with_cpdf:1}%{!?_with_cpdf:0}
+%if %{?_without_cpdf:0}%{!?_without_cpdf:1}
 %files cpdf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/cpdf.so
@@ -1989,9 +2012,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/ctype.so
 
+%if %{!?_without_curl:1}%{?_without_curl:0}
 %files curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/curl.so
+%endif
 
 %files dba
 %defattr(644,root,root,755)
@@ -2082,17 +2107,23 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mcrypt.so
 
+%if %{!?_without_mhash:1}%{?_without_mhash:0}
 %files mhash
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mhash.so
+%endif
 
+%if %{!?_without_ming:1}%{?_without_ming:0}
 %files ming
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/ming.so
+%endif
 
+%if %{!?_without_mnogosearch:1}%{?_without_mnogosearch:0}
 %files mnogosearch
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mnogosearch.so
+%endif
 
 %if %{?_without_msession:0}%{!?_without_msession:1}
 %files msession
@@ -2132,14 +2163,17 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/overload.so
 
-# disabled in 4.2.0 - it segfaults
-#%files pcntl
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{extensionsdir}/pcntl.so
+%if %{?_with_pcntl:1}%{!?_with_pcntl:0}
+%files pcntl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{extensionsdir}/pcntl.so
+%endif
 
+%if %{?_without_pcre:0}%{!?_without_pcre:1}
 %files pcre
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pcre.so
+%endif
 
 %if %{?_without_pdf:0}%{!?_without_pdf:1}
 %files pdf
@@ -2147,17 +2181,21 @@ fi
 %attr(755,root,root) %{extensionsdir}/pdf.so
 %endif
 
+%if %{!?_without_psql:1}%{?_without_psql:0}
 %files pgsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pgsql.so
+%endif
 
 %files posix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/posix.so
 
+%if %{!?_without_pspell:1}%{?_without_pspell:0}
 %files pspell
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pspell.so
+%endif
 
 %if %{?_without_recode:0}%{!?_without_recode:1}
 %files recode
@@ -2184,7 +2222,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/sockets.so
 
-%if %{?_with_sybase_ct:1}%{!?_with_sybase_ct:0}
+%if %{?_without_sybase_ct:0}%{!?_without_sybase_ct:1}
 %files sybase-ct
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/sybase_ct.so
@@ -2204,13 +2242,17 @@ fi
 %attr(755,root,root) %{extensionsdir}/wddx.so
 %endif
 
+%if %{?_without_xml:0}%{!?_without_xml:1}
 %files xml
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/xml.so
+%endif
 
+%if %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1}
 %files xmlrpc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/xmlrpc.so
+%endif
 
 %if %{?_without_xslt:0}%{!?_without_xslt:1}
 %files xslt
@@ -2239,13 +2281,13 @@ fi
 %dir %{php_pear_dir}
 %dir %{php_pear_dir}/Archive
 %dir %{php_pear_dir}/Auth
-%dir %{php_pear_dir}/Auth_HTTP
 %dir %{php_pear_dir}/Console
 %dir %{php_pear_dir}/Crypt
 %dir %{php_pear_dir}/Date
 %dir %{php_pear_dir}/DB
 %dir %{php_pear_dir}/File
 %dir %{php_pear_dir}/HTML
+%dir %{php_pear_dir}/HTML/Template
 %dir %{php_pear_dir}/HTTP
 %dir %{php_pear_dir}/Image
 %dir %{php_pear_dir}/Mail
This page took 0.054489 seconds and 4 git commands to generate.