rpms/php/F-7 php.spec,1.139,1.140 sources,1.32,1.33

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28747

Modified Files:
	php.spec sources 
Log Message:
* Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7
- obsolete php-dbase
- add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)
- enable dbase extension and package in -common
- update to 5.2.3 (thanks to Jeff Sheltren) (#246533)



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- php.spec	9 May 2007 16:42:21 -0000	1.139
+++ php.spec	10 Jul 2007 16:31:27 -0000	1.140
@@ -5,8 +5,8 @@
 
 Summary: The PHP HTML-embedded scripting language
 Name: php
-Version: 5.2.2
-Release: 4
+Version: 5.2.3
+Release: 1%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -86,8 +86,8 @@
 Provides: php-openssl, php-pcre, php-posix, php-pspell
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
-Provides: php-wddx, php-zlib, php-json, php-zip
-Obsoletes: php-openssl, php-pecl-zip, php-json
+Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
+Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
 The php-common package contains files used by both the php
@@ -289,6 +289,48 @@
 The php-dba package contains a dynamic shared object that will add
 support for using the DBA database abstraction layer to PHP.
 
+%package mcrypt
+Summary: Standard PHP module provides mcrypt library support
+Group: Development/Languages
+Requires: php-common = %{version}-%{release}
+BuildRequires: libmcrypt-devel
+
+%description mcrypt
+The php-mcrypt package contains a dynamic shared object that will add
+support for using the mcrypt library to PHP.
+
+%package mhash
+Summary: Standard PHP module provides mhash support
+Group: Development/Languages
+Requires: php-common = %{version}-%{release}
+BuildRequires: mhash-devel
+
+%description mhash
+The php-mhash package contains a dynamic shared object that will add
+support for using the mhash library to PHP.
+
+%package tidy
+Summary: Standard PHP module provides tidy library support
+Group: Development/Languages
+Requires: php-common = %{version}-%{release}
+BuildRequires: libtidy-devel
+
+%description tidy
+The php-tidy package contains a dynamic shared object that will add
+support for using the tidy library to PHP.
+
+%package mssql
+Summary: MSSQL database module for PHP
+Group: Development/Languages
+Requires: php-common = %{version}-%{release}
+BuildRequires: freetds-devel
+
+%description mssql
+The php-mssql package contains a dynamic shared object that will
+add MSSQL database support to PHP.  It uses the TDS (Tabular
+DataStream) protocol through the freetds library, hence any
+database server which supports TDS can be accessed.
+
 %prep
 %setup -q
 %patch1 -p1 -b .gnusrc
@@ -459,7 +501,12 @@
       --with-pdo-sqlite=shared,%{_prefix} \
       --enable-json=shared \
       --enable-zip=shared \
-      --with-readline
+      --with-readline \
+      --enable-dbase=shared \
+      --with-mcrypt=shared,%{_prefix} \
+      --with-mhash=shared,%{_prefix} \
+      --with-tidy=shared,%{_prefix} \
+      --with-mssql=shared,%{_prefix}
 popd
 
 # Build Apache module, and the CLI SAPI, /usr/bin/php
@@ -493,17 +540,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 # Install everything from the CGI SAPI build
-pushd build-cgi
-make install INSTALL_ROOT=$RPM_BUILD_ROOT 
-mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-cgi
-# Install the CLI SAPI as /usr/bin/php
-make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
-popd
+make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT 
 
 # Install the Apache module
-pushd build-apache
-make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
-popd
+make -C build-apache install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # Install the default configuration file and icons
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
@@ -533,7 +573,8 @@
 # Generate files lists and stub .ini files for each subpackage
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
     mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
-    pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip; do
+    pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
+    dbase mcrypt mhash tidy mssql; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -559,8 +600,8 @@
 # isn't useful at this time since rpm itself requires sqlite.
 cat files.pdo_sqlite >> files.pdo
 
-# Package json and zip in -common.
-cat files.json files.zip > files.common
+# Package json, dbase and zip in -common.
+cat files.json files.dbase files.zip > files.common
 
 # Install the macros file:
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
@@ -631,8 +672,18 @@
 %files bcmath -f files.bcmath
 %files dba -f files.dba
 %files pdo -f files.pdo
+%files mcrypt -f files.mcrypt
+%files mhash -f files.mhash
+%files tidy -f files.tidy
+%files mssql -f files.mssql
 
 %changelog
+* Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7
+- obsolete php-dbase
+- add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)
+- enable dbase extension and package in -common
+- update to 5.2.3 (thanks to Jeff Sheltren) (#246533)
+
 * Wed May  9 2007 Joe Orton <jorton at redhat.com> 5.2.2-4
 - fix php-pdo *_arg_force_ref global symbol abuse (#216125)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	4 May 2007 10:08:53 -0000	1.32
+++ sources	10 Jul 2007 16:31:27 -0000	1.33
@@ -1 +1 @@
-7a920d0096900b2b962b21dc5c55fe3c  php-5.2.2.tar.gz
+df79b04d63fc4c1ccb6d8ea58a9cf3ac  php-5.2.3.tar.gz