[php-phpunit-PHPUnit-MockObject/el6] update to 1.1.0

[Remi Collet]

commit 02c8d3b91f60f56e5599308295b1e10629c75ce2
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 17 19:15:12 2012 +0100

    update to 1.1.0

 .gitignore                          |    7 ++---
 php-phpunit-PHPUnit-MockObject.spec |   46 +++++++++++++++-------------------
 sources                             |    2 +-
 3 files changed, 24 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26d8147..e321908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
+*~
 package*.xml
-/PHPUnit_MockObject-1.0.3.tgz
-/PHPUnit_MockObject-1.0.5.tgz
-/PHPUnit_MockObject-1.0.6.tgz
-/PHPUnit_MockObject-1.0.7.tgz
 /PHPUnit_MockObject-1.0.8.tgz
+/PHPUnit_MockObject-1.0.9.tgz
+/PHPUnit_MockObject-1.1.0.tgz
diff --git a/php-phpunit-PHPUnit-MockObject.spec b/php-phpunit-PHPUnit-MockObject.spec
index ecb9393..7227845 100644
--- a/php-phpunit-PHPUnit-MockObject.spec
+++ b/php-phpunit-PHPUnit-MockObject.spec
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHPUnit-MockObject
-Version:        1.0.8
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Mock Object library for PHPUnit
 
@@ -14,39 +14,27 @@ 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-soap >= 5.2.7
-Requires:       php-pear(%{channel}/Text_Template) >= 1.0.0
-Requires:       php-pear(%{channel}/PHPUnit) >= 3.5.0
+Requires:       php-pear(%{channel}/Text_Template) >= 1.1.1
+Requires:       php-pear(%{channel}/PHPUnit) >= 3.6.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
+
 %description
 Mock Object library for PHPUnit
 
 
 %prep
 %setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
-# Create links for standard RPM docdir (to standard PEAR docdir)
-ln -s %{pear_docdir}/%{pear_name}/LICENSE            LICENSE
-ln -s %{pear_docdir}/%{pear_name}/ChangeLog.markdown CHANGELOG
-
 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
@@ -55,20 +43,20 @@ cd %{pear_name}-%{version}
 
 
 %install
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-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
@@ -84,12 +72,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGELOG
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/PHPUnit/Framework/MockObject
 
+
 %changelog
+* Tue Nov 01 2011 Remi Collet <remi at fedoraproject.org> - 1.1.0-1
+- Version 1.1.0 (stable) - API 1.1.0 (stable)
+- remove PEAR hack
+- raise PEAR dependency to 1.9.4
+- doc in /usr/share/doc/pear
+
 * Wed Feb 16 2011 Remi Collet <Fedora at famillecollet.com> - 1.0.8-1
 - Version 1.0.8 (stable) - API 1.0.4 (stable)
 
diff --git a/sources b/sources
index 342e3e7..6047376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e597029c1b9f1de0a240b7c46c6e0f6c  PHPUnit_MockObject-1.0.8.tgz
+158b177ccd0026a8183f631c54ce9cfc  PHPUnit_MockObject-1.1.0.tgz