[php-phpunit-PHPUnit/f15] update to 3.5.14

Remi Collet remi at fedoraproject.org
Fri Jun 10 14:06:07 UTC 2011


commit a7d77325b6d8c94e465b09310ddef7367c95b976
Author: remi <fedora at famillecollet.com>
Date:   Fri Jun 10 16:05:50 2011 +0200

    update to 3.5.14

 .gitignore               |    9 ++-------
 php-phpunit-PHPUnit.spec |   27 +++++++++++----------------
 sources                  |    2 +-
 3 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0481cac..abe1d00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
+*~
 package*.xml
-/PHPUnit-3.5.4.tgz
-/PHPUnit-3.5.5.tgz
-/PHPUnit-3.5.6.tgz
-/PHPUnit-3.5.7.tgz
-/PHPUnit-3.5.9.tgz
-/PHPUnit-3.5.10.tgz
-/PHPUnit-3.5.11.tgz
+/PHPUnit-3.5.14.tgz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 2994ba2..159a962 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHPUnit
-Version:        3.5.11
+Version:        3.5.14
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -15,14 +15,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.2
 BuildRequires:  php-channel(%{channel})
 
 Requires:       php-xml >= 5.2.7
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.symfony-project.com/YAML) >= 1.0.2
 Requires:       php-pear(%{channel}/File_Iterator) >= 1.2.3
 Requires:       php-pear(%{channel}/Text_Template) >= 1.0.0
 Requires:       php-pear(%{channel}/PHP_CodeCoverage) >= 1.0.2
@@ -57,19 +56,9 @@ for the creation, execution and analysis of Unit Tests.
 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}/README.markdown    README
-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
@@ -115,7 +104,6 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README CHANGELOG
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/%{pear_name}
@@ -123,6 +111,13 @@ fi
 
 
 %changelog
+* Fri Jun 10 2011 Remi Collet <Fedora at famillecollet.com> - 3.5.14-1
+- Version 3.5.14 (stable) - API 3.5.7 (stable)
+- doc in /usr/share/doc/pear
+- remove PEAR hack (only needed for EPEL)
+- raise PEAR dependency to 1.9.2
+- remove duplicate dependency (YAML)
+
 * Wed Feb 16 2011 Remi Collet <Fedora at famillecollet.com> - 3.5.11-1
 - Version 3.5.11 (stable) - API 3.5.7 (stable)
 - new dependency on php-pear(XML_RPC2)
diff --git a/sources b/sources
index 82ab81a..718ab06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddad3f5b0a2743b73bb6ad408c6b284d  PHPUnit-3.5.11.tgz
+0c0e6b7ecbdf85a01867e89e07e2c143  PHPUnit-3.5.14.tgz


More information about the scm-commits mailing list