rpms/php-pear-DB/EL-5 php-pear-DB.spec,1.6,1.7 sources,1.2,1.3

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-DB/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20196

Modified Files:
	php-pear-DB.spec sources 
Log Message:
update to 1.7.13


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/EL-5/php-pear-DB.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-DB.spec	10 Sep 2006 00:01:38 -0000	1.6
+++ php-pear-DB.spec	3 Jan 2008 08:48:57 -0000	1.7
@@ -2,14 +2,16 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.6
-Release:        7%{?dist}
+Version:        1.7.13
+Release:        1%{?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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,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
@@ -42,9 +44,25 @@
 %prep
 %setup -q -c
 [ -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@' \
+    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@' \
+    tests/driver/run.cvs >run2
 
+sed -e "s@// 'sqlite'@'sqlite'@" \
+    tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -68,11 +86,29 @@
 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/
+
+mv docdir/%{pear_name}/doc/TESTERS .
+iconv -f ISO-8859-1 -t UTF-8  TESTERS -o docdir/%{pear_name}/doc/TESTERS
+touch -r TESTERS docdir/%{pear_name}/doc/TESTERS
+
 
 %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 || :
@@ -86,14 +122,32 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG %{pear_name}-%{version}/docdir/%{pear_name}/doc/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_testdir}/DB
-# Expand this as needed to avoid owning dirs owned by our dependencies
 %{pear_phpdir}/DB*
+%{pear_testdir}/DB
+%exclude %{pear_testdir}/DB/tests/run.cvs
+%exclude %{pear_testdir}/DB/tests/driver/*.cvs
 
 
 %changelog
+* Fri Sep 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.13-1
+- update to 1.7.13
+- fix TEXTERS encoding
+
+* 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
+
 * Sun Sep 10 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-7
 - Update spec to new conventions (#198706)
 
@@ -101,7 +155,7 @@
 - Move tests to peardir/test instead of peardir/tests (bug #196764)
 
 * Wed May 17 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-5
-- Moved package XML file to %{peardir}/.pkgxml (see bug #190252)
+- Moved package XML file to %%{peardir}/.pkgxml (see bug #190252)
 - Abstracted package XML directory
 - Removed some "-f"s on rm's to avoid masking possible errors
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jan 2006 16:09:07 -0000	1.2
+++ sources	3 Jan 2008 08:48:57 -0000	1.3
@@ -1 +1 @@
-b5ff032f7e8873174e3e7fc21b7ec696  DB-1.7.6.tgz
+39b451245941a7059511a852f18b4946  DB-1.7.13.tgz