[php-pear-DB-DataObject/f18] Version 1.11.1 (stable) - API 1.9.0 (stable)

[Remi Collet]

commit 8652e44c5adae46f4e958347fa9a135919071401
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Apr 5 08:29:26 2013 +0200

    Version 1.11.1 (stable) - API 1.9.0 (stable)

 .gitignore                  |    2 ++
 php-pear-DB-DataObject.spec |   36 +++++++++++++++++++++++-------------
 sources                     |    2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2cd11bd..d0b945a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ php-pear-DB-DataObject.spec~
 package-*.xml
 /DB_DataObject-1.9.6.tgz
 /DB_DataObject-1.10.0.tgz
+/DB_DataObject-1.11.0.tgz
+/DB_DataObject-1.11.1.tgz
diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec
index 1302034..73a6709 100644
--- a/php-pear-DB-DataObject.spec
+++ b/php-pear-DB-DataObject.spec
@@ -1,8 +1,9 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.10.0
+Version:        1.11.1
 Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
@@ -17,14 +18,19 @@ BuildArch:      noarch
 BuildRequires:  php-pear
 
 Requires:       php-pear(PEAR)
-Requires:       php-pear(DB) >= 1.7.0
 Requires:       php-pear(Date) >= 1.4.3
-Requires:       php-pear(MDB2) >= 2.0.0
+# Optional
 Requires:       php-pear(Validate) >= 0.1.1
+# MDB2 and DB are now optional dependancies, although one of them is required.
+Requires:       php-pear(DB) >= 1.7.0
+Requires:       php-pear(MDB2) >= 2.0.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 # extensions detected by phpci
-Requires:       php-date, php-pcre, php-reflection, php-session
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-reflection
+Requires:       php-session
 # still optional, according to used driver: sqlite, mysql, pgsql
 
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -42,7 +48,8 @@ your configuration files and your base classes.
 
 %prep
 %setup -qc
-%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
+
+%{_bindir}/php %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
 
 cd %{pear_name}-%{version}
 # package.xml is V2
@@ -55,25 +62,25 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -d %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 # Move createTables script to /usr/bin
-chmod +x $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php
+chmod +x %{buildroot}%{pear_phpdir}/DB/DataObject/createTables.php
 ln -s ../..%{pear_phpdir}/DB/DataObject/createTables.php \
-      $RPM_BUILD_ROOT%{_bindir}/createTables
+      %{buildroot}%{_bindir}/createTables
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -98,6 +105,9 @@ fi
 
 
 %changelog
+* Fri Apr  5 2013 Remi Collet <remi at fedoraproject.org> - 1.11.1
+- Version 1.11.1 (stable) - API 1.9.0 (stable)
+
 * Sat Aug 04 2012 Remi Collet <Fedora at FamilleCollet.com> - 1.9.6-1
 - Version 1.10.0 (stable) - API 1.9.0 (stable)
 
diff --git a/sources b/sources
index 9769408..21f6d95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b15793c4c1260de9656405aaadd3878a  DB_DataObject-1.10.0.tgz
+68e694d901fc7ff08e5442d4e0f304e2  DB_DataObject-1.11.1.tgz