rpms/php-pear-DB/F-7 php-pear-DB.spec,1.7,1.8 sources,1.3,1.4

[Remi Collet (remi)]

Author: remi

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

Modified Files:
	php-pear-DB.spec sources 
Log Message:
update to 1.7.12 and fix license


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/php-pear-DB.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear-DB.spec	2 Jun 2007 07:22:32 -0000	1.7
+++ php-pear-DB.spec	23 Aug 2007 17:34:39 -0000	1.8
@@ -2,12 +2,12 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.11
-Release:        1%{?dist}
+Version:        1.7.12
+Release:        2%{?dist}
 Summary:        PEAR: Database Abstraction Layer
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/DB
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
@@ -19,7 +19,7 @@
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
-Requires:       php >= 4.2.0
+Requires:       php-common >= 4.2.0
 Requires:       php-pear(PEAR)
 
 %description
@@ -46,8 +46,22 @@
 [ -f package2.xml ] || mv package.xml package2.xml
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-cd %{pear_name}-%{version}
 
+# update run test suite
+sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
+    -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
+    -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests@' \
+    -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
+    %{pear_name}-%{version}/tests/run.cvs >run1
+
+sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
+    -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
+    -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests/driver@' \
+    -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
+    %{pear_name}-%{version}/tests/driver/run.cvs >run2
+
+sed -e "s@// 'sqlite'@'sqlite'@" \
+    %{pear_name}-%{version}/tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -71,11 +85,25 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Install new test suite
+install -pm 755 ../run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
+install -pm 755 ../run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
+install -pm 644 ../setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%check
+## can only be run as "root" after install
+## because %{_libdir}/php/build not writable
+#cd %{pear_testdir}/DB/tests
+#./run
+#cd %{pear_testdir}/DB/tests/driver
+#./run
+
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
@@ -91,11 +119,22 @@
 %defattr(-,root,root,-)
 %doc CHANGELOG %{pear_name}-%{version}/docdir/%{pear_name}/doc/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/DB
 %{pear_phpdir}/DB*
+%{pear_testdir}/DB
+%exclude %{pear_testdir}/DB/tests/run.cvs
+%exclude %{pear_testdir}/DB/tests/driver/*.cvs
 
 
 %changelog
+* Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-2
+- Fix License
+
+* Mon Jul 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-1
+- update to 1.7.12
+- change requires from php to php-common
+- update test suite to run (but only after install)
+- add %%check, only for documentation purpose
+
 * Mon Apr 30 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.11-1
 - update to 1.7.11
 - add generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2007 07:22:32 -0000	1.3
+++ sources	23 Aug 2007 17:34:39 -0000	1.4
@@ -1 +1 @@
-a57302138757500706e075a4d3d87ef7  DB-1.7.11.tgz
+b86134520d473db3c5fb87b68a820037  DB-1.7.12.tgz