- started update to 4.3.2

- commented out obsoleted patch16 (php-dl-pcre.patch) - applied upstream
  (to be removed)
- updated some patches
- php-cpdf-fix.patch and php-odbc-fix.patch still need to be updated
- removed manual (this will be in seperate spec)
- fails on %%configure (HGW why)
- release 0.1, not finished yet

Changed files:
    php.spec -> 1.259

diff --git a/php.spec b/php.spec
index d5a3a0ce9d4aaaa2f8d84ea7845ec4c338d4a013..8a8035a8669883df555fe6a99d2e3f3534371efb 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -60,7 +60,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.3.2
-Release:       1
+Release:       0.1
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -68,8 +68,6 @@ License:      PHP
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 Source1:       FAQ.%{name}
 Source2:       zend.gif
-# Source3-md5: d89cb5124f95d2c30fb0d0e2dfe5de4e
-Source3:       http://www.php.net/distributions/manual/%{name}_manual_en.tar.bz2
 Source4:       %{name}-module-install
 Source5:       %{name}-mod_%{name}.conf
 Source6:       %{name}-cgi.ini
@@ -338,24 +336,6 @@ PHP. 
 oracle, ÕÓÔÁÎÏ×ÉÔÅ ÜÔÏÔ ÐÁËÅÔ ÄÌÑ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ ÏÔÄÅÌØÎÙÈ ÒÁÓÛÉÒÅÎÉÊ.
 ðÏÄÒÏÂÎÏÓÔÉ - × ÆÁÊÌÅ SELF-CONTAINED-EXTENSIONS.
 
-%package doc
-Summary:       Online manual for PHP
-Summary(pl):   Dokumentacja dla PHP
-Summary(pt_BR):        Manual da linguagem PHP, em formato HTML
-Group:         Networking/Daemons
-Obsoletes:     php-manual
-
-%description doc
-Comprehensive documentation for PHP, viewable through your web server,
-too!
-
-%description doc -l pl
-Dokumentacja dla pakietu PHP. Mo¿na j± równie¿ ogl±daæ poprzez serwer
-WWW.
-
-%description doc -l pt_BR
-Manual da linguagem PHP, em formato HTML.
-
 %package bcmath
 Summary:       bcmath extension module for PHP
 Summary(pl):   Modu³ bcmath dla PHP
@@ -1324,16 +1304,16 @@ Repozytorium Aplikacji.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1
 %patch8 -p1
-%patch9 -p1
+#%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
+#%patch16 -p1
 %patch17 -p1
 cp php.ini-dist php.ini
 %patch18 -p1
@@ -1347,13 +1327,10 @@ cp php.ini-dist php.ini
 %patch24 -p1
 %patch25 -p1
 
-install -d manual
-bzip2 -dc %{SOURCE3} | tar -xf - -C manual
-
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
-./buildconf
+./buildconf --force
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -2082,10 +2059,6 @@ fi
 %{_includedir}/php
 %{_libdir}/php/build
 
-%files doc
-%defattr(644,root,root,755)
-%doc manual/*
-
 %files bcmath
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/bcmath.so