[php-pear-MDB2-Driver-mysqli/el6/master] update to 1.5.0b3, mainly for roundcubemail
Remi Collet
remi at fedoraproject.org
Sun Apr 17 13:54:32 UTC 2011
commit 1508b80e9a63946f61225870b3c0ae83dd71acf5
Author: remi <fedora at famillecollet.com>
Date: Sun Apr 17 15:54:31 2011 +0200
update to 1.5.0b3, mainly for roundcubemail
.gitignore | 2 +
php-pear-MDB2-Driver-mysqli-1.4.1-lob.patch | 30 --------------
php-pear-MDB2-Driver-mysqli.spec | 59 ++++++++++++++++-----------
sources | 2 +-
4 files changed, 38 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0deeb23..b648436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+package*.xml
MDB2_Driver_mysqli-1.4.1.tgz
+/MDB2_Driver_mysqli-1.5.0b3.tgz
diff --git a/php-pear-MDB2-Driver-mysqli.spec b/php-pear-MDB2-Driver-mysqli.spec
index 6d255aa..3c3a08c 100644
--- a/php-pear-MDB2-Driver-mysqli.spec
+++ b/php-pear-MDB2-Driver-mysqli.spec
@@ -1,25 +1,31 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name MDB2_Driver_mysqli
+%global pear_name MDB2_Driver_mysqli
+%global prever b3
Name: php-pear-MDB2-Driver-mysqli
-Version: 1.4.1
-Release: 5%{?dist}
+Version: 1.5.0
+%if 0%{?prever:1}
+Release: 0.1.%{prever}%{?dist}
+%else
+Release: 1%{?dist}
+%endif
Summary: MySQL Improved MDB2 driver
Group: Development/Libraries
License: BSD
URL: http://pear.php.net/package/MDB2_Driver_mysqli
-Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Patch0: php-pear-MDB2-Driver-mysqli-1.4.1-lob.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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 >= 1:1.4.9-1.2
+BuildRequires: php-pear(PEAR) >= 1.9.0
+
Requires: php-pear(PEAR)
-Requires: php-pear(MDB2) >= 2.4.1
+Requires: php-pear(MDB2) >= 2.5.0
+Requires: php-mysql >= 5.3.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Provides: php-pear(%{pear_name}) = %{version}
+Provides: php-pear(%{pear_name}) = %{version}%{?prever}
%description
This is the MySQL Improved MDB2 driver.
@@ -27,33 +33,31 @@ This is the MySQL Improved MDB2 driver.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-cd %{pear_name}-%{version}
+# 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 - Hack to lower PEAR requirement
+sed -e '/<min>/s/1.9.1/1.9.0/' <../package.xml >%{name}.xml
%build
-cd %{pear_name}-%{version}
+cd %{pear_name}-%{version}%{?prever}
# Empty build section, most likely nothing required.
%install
-cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+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}/.??*
# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-
-# Add LOB security patch (bz #379081)
-# Must be patched manually after install
-pushd $RPM_BUILD_ROOT%{pear_phpdir}
-patch -p1 < %{PATCH0}
-popd
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
@@ -62,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -73,7 +77,7 @@ fi
%files
%defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_datadir}/%{pear_name}
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/MDB2/Driver/*/mysqli.php
@@ -81,6 +85,13 @@ fi
%changelog
+* Sun Apr 17 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-0.1.b3.el6
+- hack to lower PEAR requirement
+
+* Sun Jan 02 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-0.1.b3
+- update to 1.5.0b3
+- move MDB2_Driver_mysqli.xml to php-pear-MDB2-Driver-mysqli.xml
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 3e5ebbf..6acf057 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb93eb4687da1a1018c832622da42f6f MDB2_Driver_mysqli-1.4.1.tgz
+205e53bc57c6d50fde422337fcdf7bb9 MDB2_Driver_mysqli-1.5.0b3.tgz
More information about the scm-commits
mailing list