X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=c4e28fb26d3a4447a65c9efc30bb5599b85794a1;hp=d2e73481075032ea15685fbfa24ace3f43ec9fca;hb=dadaac17a90d53a385a4af3ec357daacd39ba56b;hpb=e261b32c50d450c54b01d2fb8f5b3745c2c0ac79 diff --git a/php.spec b/php.spec index d2e7348..c4e28fb 100644 --- a/php.spec +++ b/php.spec @@ -1,4 +1,10 @@ # +# TODO: +# - BUILD!!! (more voodoo for multiple SAPIs; fix for new libtool) +# - fastcgi option in cgi SAPI? +# - add cli SAPI? +# - check/update "experimental" in descriptions +# # Automatic pear requirements finding: %include /usr/lib/rpm/macros.php @@ -15,7 +21,8 @@ %endif # Conditional build: -# _with_interbase - with InterBase extension module (BR: proprietary libs) +# _with_db3 - use db3 packages instead of db (4.x) for Berkeley DB support +# _with_interbase_inst - use InterBase install., not Firebird (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) @@ -25,6 +32,7 @@ # _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_interbase - without InterBase extension module # _without_ldap - without LDAP extension module # _without_mhash - without mhash extension module # _without_ming - without ming extension module @@ -52,8 +60,8 @@ Summary(pt_BR): A linguagem de script PHP Summary(ru): PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ Summary(uk): PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦ Name: php -Version: 4.2.3 -Release: 6 +Version: 4.3.0 +Release: 0.1 Epoch: 3 Group: Libraries License: PHP @@ -62,34 +70,39 @@ Source1: FAQ.%{name} Source2: zend.gif Source3: http://www.php.net/distributions/manual/%{name}_manual_en.tar.bz2 Source4: %{name}-module-install -Source5: %{name}-mod_php.conf +Source5: %{name}-mod_%{name}.conf Source6: %{name}-cgi.ini Source7: %{name}-apache.ini Patch0: %{name}-shared.patch Patch1: %{name}-pldlogo.patch -Patch2: %{name}-mysql-socket.patch +Patch2: %{name}-xml-expat-fix.patch +#Patch2: %{name}-mysql-socket.patch Patch3: %{name}-mail.patch Patch4: %{name}-link-libs.patch -Patch5: %{name}-fastcgi.patch +#Patch5: %{name}-fastcgi.patch Patch6: %{name}-libpq_fs_h_path.patch Patch7: %{name}-wddx-fix.patch Patch8: %{name}-cpdf-fix.patch -Patch9: %{name}-session-fix-shared.patch +#Patch9: %{name}-session-fix-shared.patch Patch10: %{name}-hyperwave-fix.patch -Patch11: %{name}-openssl-for-ext-only.patch +Patch11: %{name}-odbc-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 +#Patch16: %{name}-sapi-ini-file.patch +#Patch17: %{name}-%{name}_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 +#Patch23: %{name}-iconv-bug18039.patch +Patch24: %{name}-db4.patch Icon: php4.gif URL: http://www.php.net/ +%{!?_without_interbase:%{!?_with_interbase_inst:BuildRequires: Firebird-devel}} BuildRequires: apache-devel BuildRequires: autoconf >= 2.53 BuildRequires: automake >= 1.4d @@ -98,7 +111,8 @@ BuildRequires: bzip2-devel BuildRequires: cracklib-devel >= 2.7-15 %{!?_without_curl:BuildRequires: curl-devel} BuildRequires: cyrus-sasl-devel -BuildRequires: db3-devel >= 3.1.17 +%{?_with_db3:BuildRequires: db3-devel} +%{!?_with_db3:BuildRequires: db-devel >= 4.0} %if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1}) BuildRequires: expat-devel %endif @@ -145,7 +159,7 @@ BuildRequires: t1lib-devel %{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.6} %{!?_without_odbc:BuildRequires: unixODBC-devel} %{!?_without_xmlrpc:BuildRequires: xmlrpc-epi-devel} -BuildRequires: yaz-devel +BuildRequires: yaz-devel >= 1.9 BuildRequires: zip BuildRequires: zlib-devel >= 1.0.9 BuildRequires: zziplib-devel @@ -157,9 +171,9 @@ PreReq: apache >= 2.0.40 %else PreReq: apache(EAPI) < 2.0.0 PreReq: apache(EAPI) >= 1.3.9 +Requires(post,preun): %{apxs} +Requires(post,preun): perl %endif -PreReq: perl -PreReq: /usr/sbin/apxs PreReq: %{name}-common = %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: phpfi @@ -248,7 +262,7 @@ PHP jako program CGI. %package common Summary: Common files nneded by both apache module and CGI -Summary(pl): Wspólne pliki dla modu³u apacha i programu CGI +Summary(pl): Wspólne pliki dla modu³u apache'a i programu CGI Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ php Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ php Group: Libraries @@ -329,8 +343,8 @@ Manual da linguagem PHP, em formato HTML. Summary: bcmath extension module for PHP Summary(pl): Modu³ bcmath dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description bcmath This is a dynamic shared object (DSO) for Apache that will add bc @@ -344,8 +358,8 @@ matematycznych takich jak w programie bc. Summary: Bzip2 extension module for PHP Summary(pl): Modu³ bzip2 dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description bzip2 This is a dynamic shared object (DSO) for Apache that will add @@ -358,8 +372,8 @@ Modu Summary: Calendar extension module for PHP Summary(pl): Modu³ funkcji kalendarza dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description calendar This is a dynamic shared object (DSO) for Apache that will add @@ -373,8 +387,8 @@ wsparcie dla kalendarza. Summary: cpdf extension module for PHP Summary(pl): Modu³ cpdf dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description cpdf This is a dynamic shared object (DSO) for Apache that will add libcpdf @@ -387,8 +401,8 @@ Modu Summary: crack extension module for PHP Summary(pl): Modu³ crack dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description crack This is a dynamic shared object (DSO) for Apache that will add @@ -405,8 +419,8 @@ Uwaga: to jest modu Summary: ctype extension module for PHP Summary(pl): Modu³ ctype dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description ctype This is a dynamic shared object (DSO) for Apache that will add ctype @@ -419,8 +433,8 @@ Modu Summary: curl extension module for PHP Summary(pl): Modu³ curl dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description curl This is a dynamic shared object (DSO) for Apache that will add curl @@ -433,8 +447,8 @@ Modu Summary: DBA extension module for PHP Summary(pl): Modu³ DBA dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description dba This is a dynamic shared object (DSO) for Apache that will add @@ -448,8 +462,8 @@ wsparcie dla baz danych opartych na plikach (DBA). Summary: DBase extension module for PHP Summary(pl): Modu³ DBase dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description dbase This is a dynamic shared object (DSO) for Apache that will add DBase @@ -462,8 +476,8 @@ Modu Summary: DBX extension module for PHP Summary(pl): Modu³ DBX dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description dbx This is a dynamic shared object (DSO) for Apache that will add DB @@ -479,8 +493,8 @@ mysql, pgsql, mssql, fbsql i inne. Summary: Direct I/O extension module for PHP Summary(pl): Modu³ Direct I/O dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description dio This is a dynamic shared object (DSO) for Apache that will add direct @@ -498,8 +512,8 @@ Uwaga: to jest modu Summary: DOM XML extension module for PHP Summary(pl): Modu³ DOM XML dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description domxml This is a dynamic shared object (DSO) for Apache that will add DOM XML @@ -516,8 +530,8 @@ Uwaga: to jest modu Summary: exif extension module for PHP Summary(pl): Modu³ exif dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description exif This is a dynamic shared object (DSO) for Apache that will add exif @@ -530,8 +544,8 @@ Modu Summary: filePro extension module for PHP Summary(pl): Modu³ filePro dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description filepro This is a dynamic shared object (DSO) for Apache that will add PHP @@ -545,8 +559,8 @@ mo Summary: FTP extension module for PHP Summary(pl): Modu³ FTP dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description ftp This is a dynamic shared object (DSO) for Apache that will add FTP @@ -557,10 +571,10 @@ Modu %package gd Summary: GD extension module for PHP -Summary: Modu³ GD dla PHP +Summary(pl): Modu³ GD dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %{!?_without_gif:Requires: gd(gif)} %{!?_without_gif:Provides: %{name}-gd(gif) = %{epoch}:%{version}-%{release}} @@ -578,8 +592,8 @@ obrazk Summary: gettext extension module for PHP Summary(pl): Modu³ gettext dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description gettext This is a dynamic shared object (DSO) for Apache that will add gettext @@ -592,8 +606,8 @@ Modu Summary: gmp extension module for PHP Summary(pl): Modu³ gmp dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description gmp This is a dynamic shared object (DSO) for Apache that will add @@ -606,8 +620,8 @@ Modu Summary: Hyperwave extension module for PHP Summary(pl): Modu³ Hyperwave dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description hyperwave This is a dynamic shared object (DSO) for Apache that will add @@ -620,8 +634,8 @@ Modu Summary: iconv extension module for PHP Summary(pl): Modu³ iconv dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description iconv This is a dynamic shared object (DSO) for Apache that will add iconv @@ -635,8 +649,8 @@ Summary: IMAP extension module for PHP Summary(pl): Modu³ IMAP dla PHP Summary(pt_BR): Um módulo para aplicações PHP que usam IMAP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description imap This is a dynamic shared object (DSO) for Apache that will add IMAP @@ -649,28 +663,26 @@ Modu Um módulo para aplicações PHP que usam IMAP. %package interbase -Summary: Interbase database module for PHP -Summary(pl): Modu³ bazy danych Interbase dla PHP +Summary: InterBase/Firebird database module for PHP +Summary(pl): Modu³ bazy danych InterBase/Firebird dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} -Autoreq: false +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} +%{?_with_interbase_inst:Autoreq: false} %description interbase This is a dynamic shared object (DSO) for Apache that will add -InterBase database support to PHP. If you need back-end support for -InterBase, you should install this package in addition to the main -%{name} package. +InterBase and Firebird database support to PHP. %description interbase -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych InterBase. +Modu³ PHP umo¿liwiaj±cy dostêp do baz danych InterBase i Firebird. %package java Summary: Java extension module for PHP Summary(pl): Modu³ Javy dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description java This is a dynamic shared object (DSO) for Apache that will add JAVA @@ -686,8 +698,8 @@ Summary: LDAP extension module for PHP Summary(pl): Modu³ LDAP dla PHP Summary(pt_BR): Um módulo para aplicações PHP que usam LDAP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description ldap This is a dynamic shared object (DSO) for Apache that will add LDAP @@ -703,8 +715,8 @@ Um m Summary: mbstring extension module for PHP Summary(pl): Modu³ mbstring dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mbstring This is a dynamic shared object (DSO) for Apache that will add @@ -717,8 +729,8 @@ Modu Summary: mcal extension module for PHP Summary(pl): Modu³ mcal dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mcal This is a dynamic shared object (DSO) for Apache that will add mcal @@ -732,8 +744,8 @@ do kalendarzy). Summary: mcrypt extension module for PHP Summary(pl): Modu³ mcrypt dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mcrypt This is a dynamic shared object (DSO) for Apache that will add mcrypt @@ -746,8 +758,8 @@ Modu Summary: mhash extension module for PHP Summary(pl): Modu³ mhash dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mhash This is a dynamic shared object (DSO) for Apache that will add mhash @@ -760,8 +772,8 @@ Modu Summary: ming extension module for PHP Summary(pl): Modu³ ming dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description ming This is a dynamic shared object (DSO) for Apache that will add ming @@ -775,8 +787,8 @@ ming. Summary: mnoGoSearch extension module for PHP Summary(pl): Modu³ mnoGoSearch dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mnogosearch This is a dynamic shared object (DSO) for Apache that will allow you @@ -790,8 +802,8 @@ wyszukiwarki mnoGoSearch. Summary: msession extension module for PHP Summary(pl): Modu³ msession dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description msession This is a dynamic shared object (DSO) for Apache that will allow you @@ -810,8 +822,8 @@ Summary: MySQL database module for PHP Summary(pl): Modu³ bazy danych MySQL dla PHP Summary(pt_BR): Um módulo para aplicações PHP que usam bancos de dados MySQL Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description mysql This is a dynamic shared object (DSO) for Apache that will add MySQL @@ -828,8 +840,8 @@ Um m Summary: Oracle 8 database module for PHP Summary(pl): Modu³ bazy danych Oracle 8 dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} Autoreq: false %description oci8 @@ -846,8 +858,8 @@ Summary: ODBC extension module for PHP Summary(pl): Modu³ ODBC dla PHP Summary(pt_BR): Um módulo para aplicações PHP que usam bases de dados ODBC Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} Requires: unixODBC >= 2.1.1-3 %description odbc @@ -864,8 +876,8 @@ Um m Summary: OpenSSL extension module for PHP Summary(pl): Modu³ OpenSSL dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description openssl This is a dynamic shared object (DSO) for Apache that will add OpenSSL @@ -882,8 +894,8 @@ Uwaga: to jest modu Summary: Oracle 7 database module for PHP Summary(pl): Modu³ bazy danych Oracle 7 dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} Autoreq: false %description oracle @@ -897,8 +909,8 @@ Modu Summary: Overload extension module for PHP Summary(pl): Modu³ Overload dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description overload This is a dynamic shared object (DSO) for Apache that will add @@ -915,8 +927,8 @@ Uwaga: to jest modu Summary: Process Control extension module for PHP Summary(pl): Modu³ Process Control dla PHP Group: Libraries -Requires(post,preun): %{name}-cgi = %{version} -Requires: %{name}-cgi = %{version} +Requires(post,preun):%{name}-cgi = %{version} +Requires: %{name}-cgi = %{version} %description pcntl This is a dynamic shared object (DSO) for Apache that will add process @@ -937,8 +949,8 @@ u Summary: PCRE extension module for PHP Summary(pl): Modu³ PCRE dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description pcre This is a dynamic shared object (DSO) for Apache that will add Perl @@ -953,8 +965,8 @@ Summary: libPDF module for PHP Summary(pl): Modu³ do tworzenia plików PDF dla PHP Group: Libraries PreReq: pdflib -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description pdf This is a dynamic shared object (DSO) for Apache that will add PDF @@ -968,8 +980,8 @@ pdflib. Summary: PostgreSQL database module for PHP Summary(pl): Modu³ bazy danych PostgreSQL dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description pgsql This is a dynamic shared object (DSO) for Apache that will add @@ -987,8 +999,8 @@ Um m Summary: POSIX extension module for PHP Summary(pl): Modu³ POSIX dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description posix This is a dynamic shared object (DSO) for Apache that will add POSIX @@ -1001,8 +1013,8 @@ Modu Summary: pspell extension module for PHP Summary(pl): Modu³ pspell dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description pspell This is a dynamic shared object (DSO) for Apache that will add pspell @@ -1017,8 +1029,8 @@ sprawdzanie pisowni s Summary: recode extension module for PHP Summary(pl): Modu³ recode dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} Requires: recode >= 3.5d-3 %description recode @@ -1033,8 +1045,8 @@ bibliotek Summary: session extension module for PHP Summary(pl): Modu³ session dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description session This is a dynamic shared object (DSO) for Apache that will add session @@ -1047,8 +1059,8 @@ Modu Summary: Shared Memory Operations extension module for PHP Summary(pl): Modu³ shmop dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description shmop This is a dynamic shared object (DSO) for Apache that will add Shared @@ -1065,8 +1077,8 @@ Uwaga: to jest modu Summary: SNMP extension module for PHP Summary(pl): Modu³ SNMP dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description snmp This is a dynamic shared object (DSO) for Apache that will add SNMP @@ -1079,8 +1091,8 @@ Modu Summary: sockets extension module for PHP Summary(pl): Modu³ socket dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description sockets This is a dynamic shared object (DSO) for Apache that will add sockets @@ -1097,8 +1109,8 @@ Uwaga: to jest modu Summary: Sybase-CT extension module for PHP Summary(pl): Modu³ Sybase-CT dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description sybase-ct This is a dynamic shared object (DSO) for Apache that will add Sybase @@ -1112,8 +1124,8 @@ CT-lib. Summary: SysV sem extension module for PHP Summary(pl): Modu³ SysV sem dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description sysvsem This is a dynamic shared object (DSO) for Apache that will add SysV @@ -1126,8 +1138,8 @@ Modu Summary: SysV shm extension module for PHP Summary(pl): Modu³ SysV shm dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description sysvshm This is a dynamic shared object (DSO) for Apache that will add SysV @@ -1141,8 +1153,8 @@ Summary: wddx extension module for PHP Summary(pl): Modu³ wddx dla PHP Group: Libraries PreReq: %{name}-session = %{version} -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description wddx This is a dynamic shared object (DSO) for Apache that will add wddx @@ -1155,8 +1167,8 @@ Modu Summary: XML extension module for PHP Summary(pl): Modu³ XML dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description xml This is a dynamic shared object (DSO) for Apache that will add XML @@ -1173,8 +1185,8 @@ zwi Summary: xmlrpc extension module for PHP Summary(pl): Modu³ xmlrpc dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description xmlrpc This is a dynamic shared object (DSO) for Apache that will add XMLRPC @@ -1191,8 +1203,8 @@ Uwaga: to jest modu Summary: xslt extension module for PHP Summary(pl): Modu³ xslt dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description xslt This is a dynamic shared object (DSO) for Apache that will add xslt @@ -1205,8 +1217,9 @@ Modu Summary: yaz extension module for PHP Summary(pl): Modu³ yaz dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} +Requires: yaz >= 1.9 %description yaz This is a dynamic shared object (DSO) for Apache that will add yaz @@ -1221,8 +1234,8 @@ Z39.50 s Summary: NIS (yp) extension module for PHP Summary(pl): Modu³ NIS (yp) dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description yp This is a dynamic shared object (DSO) for Apache that will add NIS @@ -1236,8 +1249,8 @@ wsparcie dla NIS (Yellow Pages). Summary: zip extension module for PHP Summary(pl): Modu³ zip dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description zip This is a dynamic shared object (DSO) for Apache that will add ZZipLib @@ -1251,8 +1264,8 @@ Modu Summary: Zlib extension module for PHP Summary(pl): Modu³ zlib dla PHP Group: Libraries -Requires(post,preun): %{name}-common = %{version} -Requires: %{name}-common = %{version} +Requires(post,preun):%{name}-common = %{version} +Requires: %{name}-common = %{version} %description zlib This is a dynamic shared object (DSO) for Apache that will add @@ -1313,58 +1326,63 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do %setup -q %patch0 -p1 %patch1 -p1 +#%patch2 -p1 -- obsolete %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +#%patch5 -p1 -- obsolete (fastcgi interface changed) %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +#%patch9 -p1 -- obsolete %patch10 -p1 %patch11 -p1 -%patch12 -p1 +#%patch11 -p1 -- obsolete (openssl used also in common part) +#%patch12 -p1 -- needs update? to check %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +#%patch16 -p1 -- uhm... php allows _separate_ (not included) php-${SAPI}.ini files now +#%patch17 -p1 -- obsolete +#%patch18 -p1 -- obsolete? - no such file +#%patch19 -p1 -- obsolete 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 +#%patch23 -p1 -- obsolete +%patch24 -p1 install -d manual bzip2 -dc %{SOURCE3} | tar -xf - -C manual %build -CFLAGS="%{rpmcflags} -DEAPI=1 -I%{_prefix}/X11R6/include" +CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include" EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR ./buildconf %{__libtoolize} %{__aclocal} autoconf -#for i in cgi fastcgi apxs ; do +#for i in cgi cli fastcgi apxs ; do PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL for i in cgi apxs ; do %configure \ `[ $i = cgi ] && echo --enable-discard-path` \ - `[ $i = fastcgi ] && echo --enable-discard-path --with-fastcgi=%{_prefix}` \ + `[ $i != cli ] && echo --disable-cli` \ + `[ $i = cli ] && echo --disable-cgi` \ + `[ $i = fastcgi ] && --enable-fastcgi --with-fastcgi=/usr` \ %if %{_apache2} - `[ $i = apxs ] && echo --with-apxs2=%{_sbindir}/apxs` \ + `[ $i = apxs ] && echo --with-apxs2=%{apxs}` \ %else - `[ $i = apxs ] && echo --with-apxs=%{_sbindir}/apxs` \ + `[ $i = apxs ] && echo --with-apxs=%{apxs}` \ %endif --with-config-file-path=%{_sysconfdir} \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ --enable-bcmath=shared \ --enable-calendar=shared \ - --disable-cli \ --enable-ctype=shared \ --enable-dba=shared \ --enable-dbx=shared \ @@ -1395,8 +1413,7 @@ for i in cgi apxs ; do %{!?_without_cpdf:--with-cpdflib=shared} \ --with-crack=shared \ %{?_without_curl:--without-curl}%{!?_without_curl:--with-curl=shared} \ - --without-db2 \ - --with-db3 \ + %{?_with_db3:--with-db3}%{!?_with_db3:--with-db4} \ --with-dbase=shared \ --with-dom=shared \ %{!?_without_domxslt:--with-dom-xslt=shared --with-dom-exslt=shared} \ @@ -1409,12 +1426,12 @@ for i in cgi apxs ; do --with-filepro=shared \ --with-freetype-dir=shared \ --with-gettext=shared \ - --with-gd=shared \ + --with-gd=shared,/usr \ --with-gdbm \ --with-gmp=shared \ --with-hyperwave=shared \ %{!?_without_imap:--with-imap=shared --with-imap-ssl} \ - %{?_with_interbase:--with-interbase=shared} \ + %{!?_without_interbase:--with-interbase=shared%{!?_with_interbase_inst:,/usr}} \ %{?_with_java:--with-java=/usr/lib/java} \ --with-jpeg-dir=shared,/usr \ %{!?_without_ldap:--with-ldap=shared} \ @@ -1438,7 +1455,7 @@ for i in cgi apxs ; do %{!?_without_pspell:--with-pspell=shared} \ %{!?_without_recode:--with-recode=shared} \ --with-regex=php \ - --with-sablot-js=shared,no \ + --without-sablot-js \ %{!?_without_snmp:--with-snmp=shared} \ %{!?_without_sybase_ct:--with-sybase-ct=shared,/usr} \ --with-t1lib=shared \ @@ -1449,9 +1466,13 @@ for i in cgi apxs ; do --with-yaz=shared \ --with-zip=shared \ --with-zlib=shared \ - --with-zlib-dir=shared + --with-zlib-dir=shared,/usr + +cp -f Makefile Makefile.$i done +# --with-sablot-js=shared,no + # for now session_mm doesn't work with shared session module... # --enable-session=shared # %{?_without_mm:--with-mm=shared,no}%{!?_without_mm:--with-mm=shared} @@ -1460,20 +1481,24 @@ done # --with-qtdom=shared %{__make} -%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi + +cp -f Makefile.cgi Makefile +#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi +%{__make} sapi/cgi/php +cp -f Makefile.apxs Makefile # Kill -rpath from php binary and libphp4.so -perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool -%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php +#perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +#perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool +#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php -perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool -rm libphp4.la ; %{__make} libphp4.la +#perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool +#rm libphp4.la ; %{__make} libphp4.la %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}} \ - $RPM_BUILD_ROOT/home/httpd/icons \ + $RPM_BUILD_ROOT/home/services/httpd/icons \ $RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \ $RPM_BUILD_ROOT/var/run/php \ $RPM_BUILD_ROOT/etc/httpd/httpd.conf @@ -1484,11 +1509,12 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}} %{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{_libdir}} -install .libs/php $RPM_BUILD_ROOT%{_bindir}/php +#install .libs/php $RPM_BUILD_ROOT%{_bindir}/php +install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir} -install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/httpd/icons +install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE5} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf @@ -1496,7 +1522,7 @@ install %{SOURCE1} . mv -f Zend/LICENSE{,.Zend} -mkdir $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template} +install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template} %clean rm -rf $RPM_BUILD_ROOT @@ -2030,7 +2056,7 @@ fi %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini %attr(730,root,http) %dir %verify(not group mode) /var/run/php -/home/httpd/icons/* +/home/services/httpd/icons/* %attr(755,root,root) %{_sbindir}/* %attr(755,root,root) %{_libdir}/libphp_common*.so.*.*.* %dir %{extensionsdir} @@ -2137,7 +2163,7 @@ fi %attr(755,root,root) %{extensionsdir}/imap.so %endif -%if %{?_with_interbase:1}%{!?_with_interbase:0} +%if %{?_without_interbase:0}%{!?_without_interbase:1} %files interbase %defattr(644,root,root,755) %attr(755,root,root) %{extensionsdir}/interbase.so