[php-pear-DB-DataObject] update to 1.9.6

Mon Aug 29 12:47:13 UTC 2011

commit ca742c720e0281a64b96cd106a9a1542d411b68b
Author: remi <fedora at famillecollet.com>
Date:   Mon Aug 29 14:46:52 2011 +0200

    update to 1.9.6

 .gitignore                  |    6 +++---
 DB-DataObject.patch         |   24 ++++++++++++++++++++++++
 php-pear-DB-DataObject.spec |   38 ++++++++++++++++++++------------------
 sources                     |    2 +-
 4 files changed, 48 insertions(+), 22 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 310f481..95734f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-DB_DataObject-1.8.12.tgz
-package.xml
-/DB_DataObject-1.9.5.tgz
+php-pear-DB-DataObject.spec~
+package-*.xml
+/DB_DataObject-1.9.6.tgz
diff --git a/DB-DataObject.patch b/DB-DataObject.patch
new file mode 100644
index 0000000..2de647c
--- /dev/null
+++ b/DB-DataObject.patch
@@ -0,0 +1,24 @@
+diff -up DB_DataObject-1.9.6/DataObject/createTables.php.old DB_DataObject-1.9.6/DataObject/createTables.php
+--- DB_DataObject-1.9.6/DataObject/createTables.php.old	2011-08-29 14:31:36.000000000 +0200
++++ DB_DataObject-1.9.6/DataObject/createTables.php	2011-08-29 14:32:09.000000000 +0200
+@@ -33,7 +33,7 @@ if (!ini_get('register_argc_argv')) {
+ }
+ 
+ if (!@$_SERVER['argv'][1]) {
+-    PEAR::raiseError("\nERROR: createTable.php usage:\n\nC:\php\pear\DB\DataObjects\createTable.php example.ini\n\n", null, PEAR_ERROR_DIE);
++    PEAR::raiseError("\nERROR: createTable.php usage:\n\n".$_SERVER['argv'][0]." example.ini\n\n", null, PEAR_ERROR_DIE);
+     exit;
+ }
+ 
+diff -up DB_DataObject-1.9.6/php-pear-DB-DataObject.xml.old DB_DataObject-1.9.6/php-pear-DB-DataObject.xml
+--- DB_DataObject-1.9.6/php-pear-DB-DataObject.xml.old	2011-08-29 14:32:00.000000000 +0200
++++ DB_DataObject-1.9.6/php-pear-DB-DataObject.xml	2011-08-29 14:32:41.000000000 +0200
+@@ -43,7 +43,7 @@ Small fix release.
+  <contents>
+   <dir name="/">
+    <file baseinstalldir="DB" md5sum="b50c79d3a19d9e156c7bfd9a221fab55" name="DataObject/Cast.php" role="php" />
+-   <file baseinstalldir="DB" md5sum="8f7382a61580d5be68e31a7544d454d7" name="DataObject/createTables.php" role="php" />
++   <file baseinstalldir="DB" md5sum="8c56abde3ba2432dbd3d286277467739" name="DataObject/createTables.php" role="php" />
+    <file baseinstalldir="DB" md5sum="06e890beb94da0cfd9782b220989f25f" name="DataObject/Error.php" role="php" />
+    <file baseinstalldir="DB" md5sum="3cdc2349086d9fd6bea4a8c09cc38186" name="DataObject/Generator.php" role="php" />
+    <file baseinstalldir="DB" md5sum="9d98e006265435a3e6e8a3e08a659c3b" name="docs/example.ini" role="doc" />
diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec
index caf50d2..bd28bdd 100644
--- a/php-pear-DB-DataObject.spec
+++ b/php-pear-DB-DataObject.spec
@@ -2,8 +2,8 @@
 %global pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.9.5
-Release:        2%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
@@ -12,6 +12,9 @@ URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
+# http://pear.php.net/bugs/18767 hard coded path
+Patch0:         DB-DataObject.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
@@ -40,14 +43,12 @@ your configuration files and your base classes.
 %setup -qc
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
 
+%patch0 -p1 -b .old
+
 
 %build
 cd %{pear_name}-%{version}
@@ -55,13 +56,9 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -71,10 +68,9 @@ install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to /usr/bin
-mv $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php $RPM_BUILD_ROOT%{_bindir}
-chmod +x $RPM_BUILD_ROOT%{_bindir}/createTables.php
-ln -s ../../../../..%{_bindir}/createTables.php $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/
-
+chmod +x $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php
+ln -s ../..%{pear_phpdir}/DB/DataObject/createTables.php \
+      $RPM_BUILD_ROOT%{_bindir}/createTables
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,14 +89,20 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
-%{_bindir}/createTables.php
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
+%{_bindir}/createTables
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/DB/DataObject*
 %exclude %{_bindir}/DB/scripts/DB_DataObject_createTables.bat
 
 
 %changelog
+* Mon Aug 29 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.9.6-1
+- Version 1.9.6 (stable) - API 1.9.0 (stable)
+- upstream doc in /usr/share/doc/pear
+- change link for /usr/bin/createTables
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1434907..faedfbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8bc3c1644ed54498c9bbb62f82109e1  DB_DataObject-1.9.5.tgz
+347550aba68c3fd2646f5ab4eaba9a14  DB_DataObject-1.9.6.tgz
