SPECS (DEVEL): php.spec - fix cli with readline; add xmlreader mod...

[arekm]

Author: arekm                        Date: Thu Aug 25 18:39:10 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fix cli with readline; add xmlreader module; builds

---- Files affected:
SPECS:
   php.spec (1.467.2.1 -> 1.467.2.2) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.467.2.1 SPECS/php.spec:1.467.2.2
--- SPECS/php.spec:1.467.2.1	Thu Aug 25 16:09:44 2005
+++ SPECS/php.spec	Thu Aug 25 20:39:05 2005
@@ -111,6 +111,7 @@
 Patch17:	%{name}-no_pear_install.patch
 Patch18:	%{name}-zlib.patch
 Patch19:	%{name}-sybase-fix.patch
+Patch20:	%{name}-readline.patch
 Patch21:	%{name}-nohttpd.patch
 Patch22:	%{name}-lib64.patch
 Patch23:	%{name}-gd_imagerotate_enable.patch
@@ -1280,6 +1281,24 @@
 związanych z tymi plikami. Pozwala on tworzyć analizatory XML-a i
 następnie definiować procedury obsługi dla różnych zdarzeń XML.
 
+%package xmlreader
+Summary:	XML Reader extension module for PHP
+Summary(pl):	Moduł XML Reader dla PHP
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description xmlreader
+This is a dynamic shared object (DSO) for PHP that will add XML Reader
+support. The XMLReader extension is an XML Pull parser. The reader
+acts as a cursor going forward on the document stream and stopping
+at each node on the way.
+
+%description xmlreader -l pl
+Moduł PHP umożliwiający parsowanie plików XML w trybie Pull. Czytnik
+działa jako kursor przechodzący przez strumień dokumentu i zatrzymujący
+się nakażdym węźle po drodze.
+
 %package xmlrpc
 Summary:	xmlrpc extension module for PHP
 Summary(pl):	Moduł xmlrpc dla PHP
@@ -1360,10 +1379,9 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 %patch21 -p1
-%if "%{_lib}" == "lib64"
 %patch22 -p1
-%endif
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
@@ -1441,6 +1459,7 @@
 	esac
 	` \
 	--cache-file=config.cache \
+	--with-libdir=%{_lib} \
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
@@ -1475,11 +1494,11 @@
 	--enable-ucd-snmp-hack \
 	%{?with_wddx:--enable-wddx=shared} \
 	--enable-xml=shared \
-	--with-xmlreader \
+	--with-xmlreader=shared \
 	--with-bz2=shared \
 	%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
 	%{?with_db3:--with-db3}%{!?with_db3:--with-db4} \
-	--with-dbase=shared \
+	--enable-dbase=shared \
 %if %{with xmlrpc}
 	--with-expat-dir=shared,/usr \
 %else
@@ -1626,7 +1645,7 @@
 
 ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
 
-install php.ini	$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+sed -e 's#/usr/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
@@ -2130,6 +2149,12 @@
 %postun xml
 %extension_postun
 
+%post xmlreader
+%extension_post
+
+%postun xmlreader
+%extension_postun
+
 %post xmlrpc
 %extension_post
 
@@ -2367,13 +2392,14 @@
 
 %files devel
 %defattr(644,root,root,755)
-%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
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/php/build
+%{_mandir}/man1/phpize*
+%{_mandir}/man1/php-config*
 
 %files bcmath
 %defattr(644,root,root,755)
@@ -2697,6 +2723,11 @@
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xml.ini
 %attr(755,root,root) %{extensionsdir}/xml.so
 
+%files xmlreader
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xmlreader.ini
+%attr(755,root,root) %{extensionsdir}/xmlreader.so
+
 %if %{with xmlrpc}
 %files xmlrpc
 %defattr(644,root,root,755)
@@ -2720,6 +2751,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.467.2.2  2005/08/25 18:39:05  arekm
+- fix cli with readline; add xmlreader module; builds
+
 Revision 1.467.2.1  2005/08/25 14:09:44  arekm
 - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.1&r2=1.467.2.2&f=u