[php-phpunit-DbUnit/el6] update to 1.1.1
Remi Collet
remi at fedoraproject.org
Tue Jan 17 16:10:27 UTC 2012
commit feec187ba7e3ba9790583c9fe66faae52423afe0
Author: remi <fedora at famillecollet.com>
Date: Tue Jan 17 17:10:00 2012 +0100
update to 1.1.1
.gitignore | 6 +++---
php-phpunit-DbUnit.spec | 36 ++++++++++++++++--------------------
sources | 2 +-
3 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1786bc3..eb95059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*~
+*spec~
package-*.xml
-/DbUnit-1.0.2.tgz
-/DbUnit-1.0.3.tgz
+/DbUnit-1.1.0.tgz
+/DbUnit-1.1.1.tgz
diff --git a/php-phpunit-DbUnit.spec b/php-phpunit-DbUnit.spec
index 8b1475e..2a1168b 100644
--- a/php-phpunit-DbUnit.spec
+++ b/php-phpunit-DbUnit.spec
@@ -3,7 +3,7 @@
%global channel pear.phpunit.de
Name: php-phpunit-DbUnit
-Version: 1.0.3
+Version: 1.1.1
Release: 1%{?dist}
Summary: DbUnit port for PHP/PHPUnit
@@ -14,13 +14,13 @@ Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.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.4
BuildRequires: php-channel(%{channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php-pdo >= 5.2.7
-Requires: php-pear(%{channel}/PHPUnit) >= 3.5.0
+Requires: php-pear(%{channel}/PHPUnit) >= 3.6.0
Requires: php-pear(pear.symfony-project.com/YAML) >= 1.0.2
Provides: php-pear(%{channel}/%{pear_name}) = %{version}
@@ -31,18 +31,9 @@ DbUnit port for PHP/PHPUnit
%prep
%setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
cd %{pear_name}-%{version}
-# package.xml is V2 - hack to lower PEAR dependency
-%{_bindir}/php <<EOF
-<?php
-\$xml = simplexml_load_file("../package.xml");
-\$xml->dependencies->required->pearinstaller->min="1.9.0";
-file_put_contents("%{name}.xml",\$xml->asXML());
-EOF
+# package.xml is V2
+mv ../package.xml %{name}.xml
%build
@@ -51,20 +42,20 @@ cd %{pear_name}-%{version}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__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_phpdir}/.??*
# Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
@@ -87,6 +78,11 @@ fi
%changelog
+* Fri Nov 11 2011 Remi Collet <remi at fedoraproject.org> - 1.1.1-1
+- Version 1.1.1 (stable) - API 1.1.0 (stable)
+- remove PEAR hack
+- raise PEAR dependency to 1.9.4
+
* Fri Aug 19 2011 Remi Collet <remi at fedoraproject.org> - 1.0.3-1
- Version 1.0.3 (stable) - API 1.0.0 (stable)
diff --git a/sources b/sources
index 9fbe5c6..1b5d6c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6655c1655c1a0aa3f5a6ce5eb251bc71 DbUnit-1.0.3.tgz
+4eb406c4b3b9a46dae5cb202b6a88016 DbUnit-1.1.1.tgz
More information about the scm-commits
mailing list