[php-phpunit-PHPUnit/el6/master] update to 3.5.7 (bugfix)

[Remi Collet]

commit 0490b85e68f4a6574e8ab0089f32b0d323cdcd85
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 11 18:26:50 2011 +0100

    update to 3.5.7 (bugfix)

 .gitignore               |    1 +
 ChangeLog.markdown       |   95 ----------------------------------------------
 README.markdown          |   22 -----------
 php-phpunit-PHPUnit.spec |   22 ++++++-----
 sources                  |    2 +-
 5 files changed, 14 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7786d9f..3502b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ package*.xml
 /PHPUnit-3.5.4.tgz
 /PHPUnit-3.5.5.tgz
 /PHPUnit-3.5.6.tgz
+/PHPUnit-3.5.7.tgz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 4913461..35c79f1 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.6
+Version:        3.5.7
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -11,11 +11,6 @@ Group:          Development/Libraries
 License:        BSD
 URL:            http://www.phpunit.de
 Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
-# From https://github.com/sebastianbergmann/phpunit/raw/3.5.6/README.markdown
-# but with "Installation" part removed
-Source1:        README.markdown
-Source2:        https://github.com/sebastianbergmann/phpunit/raw/%{version}/ChangeLog.markdown
-
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,13 +52,15 @@ for the creation, execution and analysis of Unit Tests.
 
 %prep
 %setup -qc
-cp %{SOURCE1} README
-cp %{SOURCE2} CHANGELOG
-
 # 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}/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
@@ -117,13 +114,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README CHANGELOG
+%doc LICENSE README CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/%{pear_name}
 %{_bindir}/phpunit
 
 
 %changelog
+* Tue Jan 11 2011 Remi Collet <Fedora at famillecollet.com> - 3.5.7-1
+- Version 3.5.7 (stable) - API 3.5.7 (stable)
+- README, CHANGELOG and LICENSE are now in the tarball
+
 * Mon Dec 20 2010 Remi Collet <Fedora at famillecollet.com> - 3.5.6-1
 - Version 3.5.6 (stable) - API 3.5.4 (stable)
 - move README.mardown to README (was Changelog, now links to doc)
diff --git a/sources b/sources
index 28c7ef5..10111a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6884067a803d47f1e2d80702fa135eea  PHPUnit-3.5.6.tgz
+34775a891f3d6228567e2d07f8c0156d  PHPUnit-3.5.7.tgz