From 6671d5d15233ae16a055bdc1678f21e2c6e95ac2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Apr 03 2013 15:55:32 +0000 Subject: Version 1.11.0 (stable) - API 1.9.0 (stable) --- diff --git a/.gitignore b/.gitignore index 2cd11bd..f76e3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec index 9b34a94..1234ddd 100644 --- a/php-pear-DB-DataObject.spec +++ b/php-pear-DB-DataObject.spec @@ -3,8 +3,8 @@ %global pear_name DB_DataObject Name: php-pear-DB-DataObject -Version: 1.10.0 -Release: 3%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: An SQL Builder, Object Interface to Database Tables Group: Development/Libraries @@ -18,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,8 +47,11 @@ your configuration files and your base classes. %prep -%setup -qc -%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2 +# https://pear.php.net/bugs/19882 +%setup -qc -T +tar xif %{SOURCE0} + +%{_bindir}/php %{SOURCE2} package.xml | tee CHANGELOG | head -n 2 cd %{pear_name}-%{version} # package.xml is V2 @@ -56,25 +64,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_metadir}/.??* +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 @@ -99,6 +107,9 @@ fi %changelog +* Wed Apr 3 2013 Remi Collet - 1.11.0-1 +- Version 1.11.0 (stable) - API 1.9.0 (stable) + * Tue Feb 19 2013 Remi Collet - 1.10.0-3 - fix metadata location diff --git a/sources b/sources index 9769408..109f0f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b15793c4c1260de9656405aaadd3878a DB_DataObject-1.10.0.tgz +35dc63a4b8d29c9c02a5b5277cf1b0b2 DB_DataObject-1.11.0.tgz