[php-pear-MDB2-Driver-pgsql/el6] update to 1.5.0b4

Remi Collet remi at fedoraproject.org
Thu Mar 14 15:26:57 UTC 2013


commit 638e18438ff98ab63124693e0c8bf098c1cffc72
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Mar 14 16:26:52 2013 +0100

    update to 1.5.0b4

 .gitignore                      |    2 ++
 php-pear-MDB2-Driver-pgsql.spec |   28 ++++++++++++++++++----------
 sources                         |    2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4463136..ac435e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*spec~
 package*.xml
 MDB2_Driver_pgsql-1.4.1.tgz
 /MDB2_Driver_pgsql-1.5.0b3.tgz
+/MDB2_Driver_pgsql-1.5.0b4.tgz
diff --git a/php-pear-MDB2-Driver-pgsql.spec b/php-pear-MDB2-Driver-pgsql.spec
index 3046276..9bc75a9 100644
--- a/php-pear-MDB2-Driver-pgsql.spec
+++ b/php-pear-MDB2-Driver-pgsql.spec
@@ -1,11 +1,12 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name MDB2_Driver_pgsql
-%global prever    b3
+%global prever    b4
 
 Name:           php-pear-MDB2-Driver-pgsql
 Version:        1.5.0
 %if 0%{?prever:1}
-Release:        0.1.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 %else
 Release:        1%{?dist}
 %endif
@@ -18,11 +19,13 @@ Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?prever}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.9.0
+BuildRequires:  php-pear(PEAR) >= 1.9.1
 
-Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.5.0
-Requires:       php-pgsql >= 5.3.0
+Requires:       php-common >= 5.2.0
+Requires:       php-pcre
+Requires:       php-pgsql
+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}
@@ -38,8 +41,9 @@ cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
 
 cd %{pear_name}-%{version}%{?prever}
-# package.xml is V2 - Hack to lower PEAR requirement
-sed -e '/<min>/s/1.9.1/1.9.0/' <../package.xml >%{name}.xml
+# package.xml is V2
+mv ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}%{?prever}
@@ -52,7 +56,7 @@ cd %{pear_name}-%{version}%{?prever}
 PHPRC=../php.ini %{__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}
@@ -77,13 +81,17 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_datadir}/%{pear_name}
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/MDB2/Driver/*/pgsql.php
 %{pear_phpdir}/MDB2/Driver/pgsql.php
+# packager stuff, not need, could probably be removed
+%{pear_datadir}/%{pear_name}
 
 
 %changelog
+* Thu Mar 14 2013 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-0.8.b4
+- update to 1.5.0b4
+
 * Sun Apr 17 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-0.1.b3.el6
 - hack to lower PEAR requirement
 
diff --git a/sources b/sources
index 282ecf3..863d8a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d5caa6ef480fb75862e87aef0282229  MDB2_Driver_pgsql-1.5.0b3.tgz
+0669e332feeda13bd0ea00ff0a45661a  MDB2_Driver_pgsql-1.5.0b4.tgz


More information about the scm-commits mailing list