[php-pear-MDB2-Driver-mysql] update to 1.5.0b4

Remi Collet remi at fedoraproject.org
Wed Oct 24 11:51:14 UTC 2012


commit 56fa2e3484cac5acd5ea70300d661ae8a372be94
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Oct 24 13:51:06 2012 +0200

    update to 1.5.0b4

 .gitignore                      |    2 ++
 php-pear-MDB2-Driver-mysql.spec |   23 ++++++++++++-----------
 sources                         |    2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7554f01..f881290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*spec~
 package*.xml
 MDB2_Driver_mysql-1.4.1.tgz
 /MDB2_Driver_mysql-1.5.0b3.tgz
+/MDB2_Driver_mysql-1.5.0b4.tgz
diff --git a/php-pear-MDB2-Driver-mysql.spec b/php-pear-MDB2-Driver-mysql.spec
index 5343729..5a66f69 100644
--- a/php-pear-MDB2-Driver-mysql.spec
+++ b/php-pear-MDB2-Driver-mysql.spec
@@ -1,11 +1,12 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name MDB2_Driver_mysql
-%global prever    b3
+%global prever    b4
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.5.0
 %if 0%{?prever:1}
-Release:        0.6.%{prever}%{?dist}
+Release:        0.7.%{prever}%{?dist}
 %else
 Release:        1%{?dist}
 %endif
@@ -20,9 +21,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.9.1
 
-Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.5.0
-Requires:       php-mysql >= 5.3.0
+Requires:       php-common >= 5.2.0
+Requires:       php-mysql, php-pcre
+Requires:       php-pear(PEAR) >= 1.9.1
+Requires:       php-pear(MDB2) >= 2.5.0%{?prever}
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}%{?prever}
@@ -33,10 +35,6 @@ This is the MySQL MDB2 driver.
 
 %prep
 %setup -qc
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}%{?prever}
 # package.xml is V2
 mv ../package.xml %{name}.xml
@@ -50,10 +48,10 @@ cd %{pear_name}-%{version}%{?prever}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}%{?prever}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
@@ -86,6 +84,9 @@ fi
 
 
 %changelog
+* Wed Oct 24 2012 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-0.7.b4
+- update to 1.5.0b4
+
 * Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 1.5.0-0.6.b3
 - rebuilt for new pear_datadir
 
diff --git a/sources b/sources
index fc35081..60a6726 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b10ae9cb1dd304678879dd5e4533a031  MDB2_Driver_mysql-1.5.0b3.tgz
+8b2d9602fe001ca277b9f7149fc839fa  MDB2_Driver_mysql-1.5.0b4.tgz


More information about the scm-commits mailing list