[php-bartlett-PHP-CompatInfo/el6] update to 2.2.4
Remi Collet
remi at fedoraproject.org
Fri Feb 17 18:27:41 UTC 2012
commit 4a27c249c26ed78e6f0e836df4d5416565f648dd
Author: remi <fedora at famillecollet.com>
Date: Fri Feb 17 19:26:49 2012 +0100
update to 2.2.4
.gitignore | 6 ++++
PHP_CompatInfo-addhtml.patch | 3 +-
PHP_CompatInfo-del.patch | 53 +++-----------------------------------
PHP_CompatInfo-docs.patch | 51 ------------------------------------
php-bartlett-PHP-CompatInfo.spec | 27 ++++++++-----------
sources | 2 +-
6 files changed, 23 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6cf8f10..a8e8dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
+*spec~
+package-*.xml
/PHP_CompatInfo-2.1.0.tgz
+/PHP_CompatInfo-2.2.1.tgz
+/PHP_CompatInfo-2.2.2.tgz
+/PHP_CompatInfo-2.2.3.tgz
+/PHP_CompatInfo-2.2.4.tgz
diff --git a/PHP_CompatInfo-addhtml.patch b/PHP_CompatInfo-addhtml.patch
index 39f1a61..dd1064f 100644
--- a/PHP_CompatInfo-addhtml.patch
+++ b/PHP_CompatInfo-addhtml.patch
@@ -1,8 +1,7 @@
diff -up PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.addhtml PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml
--- PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.addhtml 2011-09-20 18:22:05.525712911 +0200
+++ PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml 2011-09-20 18:23:53.312153155 +0200
-@@ -784,6 +784,11 @@ Bug fixes:
- <file baseinstalldir="Bartlett" md5sum="c65cb59e8aa7d6e164f5908c6a4f3348" name="README.markdown" role="doc">
+@@ -785,5 +785,10 @@ Bug fixes:
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
+ <file baseinstalldir="Bartlett" name="docs/index.html" role="doc" />
diff --git a/PHP_CompatInfo-del.patch b/PHP_CompatInfo-del.patch
index 7dc6169..db4272a 100644
--- a/PHP_CompatInfo-del.patch
+++ b/PHP_CompatInfo-del.patch
@@ -1,7 +1,7 @@
-diff -up PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.del PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml
---- PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.del 2011-08-24 20:39:25.000000000 +0200
-+++ PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml 2011-09-24 17:51:50.000000000 +0200
-@@ -136,12 +136,6 @@ Bug fixes:
+diff -up PHP_CompatInfo-2.2.2/php-bartlett-PHP-CompatInfo.xml.del PHP_CompatInfo-2.2.2/php-bartlett-PHP-CompatInfo.xml
+--- PHP_CompatInfo-2.2.2/php-bartlett-PHP-CompatInfo.xml.del 2012-02-09 10:28:33.000000000 +0100
++++ PHP_CompatInfo-2.2.2/php-bartlett-PHP-CompatInfo.xml 2012-02-09 19:08:19.000000000 +0100
+@@ -135,12 +135,6 @@ Bug fixes:
<file baseinstalldir="Bartlett" md5sum="adcac4a13f10988d55dc357ff91aee0e" name="docs/images/thumb_summary2.png" role="doc">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
@@ -14,48 +14,3 @@ diff -up PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.del PHP_CompatInfo
<file baseinstalldir="Bartlett" md5sum="16cfb6e94de43a22241c92bed60d02c2" name="docs/styles/flask.css" role="doc">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
-@@ -727,18 +721,12 @@ Bug fixes:
- <file baseinstalldir="Bartlett" md5sum="145f24da557b1f463452b84013fca817" name="tests/_files/source1626.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-- <file baseinstalldir="Bartlett" md5sum="127ada0f5aa3fc185a07f39fbef94e76" name="tests/_files/source3657.php" role="test">
-- <tasks:replace from="@package_version@" to="version" type="package-info" />
-- </file>
- <file baseinstalldir="Bartlett" md5sum="42c5b6531b1172a25e6b429cc56252df" name="tests/_files/source6056.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
- <file baseinstalldir="Bartlett" md5sum="35505cce5faa97b9c143f6ce53b7a72c" name="tests/_files/source6581.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-- <file baseinstalldir="Bartlett" md5sum="249296c67a98618527669212d47923df" name="tests/_files/source7813.php" role="test">
-- <tasks:replace from="@package_version@" to="version" type="package-info" />
-- </file>
- <file baseinstalldir="Bartlett" md5sum="4ba6508ce5fb1de3d5f6e2db518c0637" name="tests/_files/source10100.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-@@ -748,9 +736,6 @@ Bug fixes:
- <file baseinstalldir="Bartlett" md5sum="be4f84e82acd838ee9202cbc87f01f0a" name="tests/_files/source13568.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-- <file baseinstalldir="Bartlett" md5sum="79676ff8f980d53d07249c5684eb12d0" name="tests/_files/source13873.php" role="test">
-- <tasks:replace from="@package_version@" to="version" type="package-info" />
-- </file>
- <file baseinstalldir="Bartlett" md5sum="c48d70ec9db9a67b61c33dcc7a82642b" name="tests/_files/source14696.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-@@ -772,15 +757,9 @@ Bug fixes:
- <file baseinstalldir="Bartlett" md5sum="bda22dd135c0c4f7ee5a0212d7a69681" name="tests/InterfaceTest.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-- <file baseinstalldir="Bartlett" md5sum="90e48d1f6e8a42c95793f5578dbad80b" name="tests/IssueTest.php" role="test">
-- <tasks:replace from="@package_version@" to="version" type="package-info" />
-- </file>
- <file baseinstalldir="Bartlett" md5sum="4d45dab1a4194641f85fbc08cd0de157" name="tests/MagicConstantTest.php" role="test">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-- <file baseinstalldir="Bartlett" md5sum="29bb287cdbe03d2b9ac5a8309198df41" name="tests/PackageTest.php" role="test">
-- <tasks:replace from="@package_version@" to="version" type="package-info" />
-- </file>
- <file baseinstalldir="Bartlett" md5sum="6fd3e176cb64b4b8a5c303ba3359d7d3" name="LICENSE" role="doc">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 52d2ba0..d5ed82d 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -13,8 +13,8 @@
Name: php-bartlett-PHP-CompatInfo
-Version: 2.1.0
-Release: 3%{?dist}
+Version: 2.2.4
+Release: 1%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
Group: Development/Libraries
@@ -23,13 +23,7 @@ License: BSD and MIT
URL: http://php5.laurent-laville.org/compatinfo/
Source0: http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%{?prever}.tgz
-# for old asciidoc version https://bugzilla.redhat.com/556171
-Patch0: PHP_CompatInfo-docs.patch
# Remove unused asciidoc*.js scripts
-# source3657.php => PHP License
-# source7813.php => PHP License
-# source13873.php => GPL
-# and tests which use this files.
Patch1: PHP_CompatInfo-del.patch
# Install generated doc using pear command
Patch2: PHP_CompatInfo-addhtml.patch
@@ -40,7 +34,7 @@ BuildRequires: php-pear(PEAR) >= 1.9.0
BuildRequires: php-channel(%{channel})
# to run test suite
BuildRequires: php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
-BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 0.7.0
+BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.3.0
%if %{withhtmldoc}
# to build HTML documentation
BuildRequires: php-pear(pear.phing.info/phing)
@@ -51,7 +45,7 @@ Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php-xml >= 5.2.0
Requires: php-pear(PEAR) >= 1.9.0
-Requires: php-pear(%{channel}/PHP_Reflect) >= 0.7.0
+Requires: php-pear(%{channel}/PHP_Reflect) >= 1.3.0
Requires: php-pear(Console_CommandLine) >= 1.1.3
Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6.1
Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
@@ -80,7 +74,6 @@ HTML Documentation: %{pear_docdir}/%{pear_name}/docs/index.html
cd %{pear_name}-%{version}%{?prever}
mv -f ../package.xml %{name}.xml
-%patch0 -p1 -b .fix
%patch1 -p1 -b .del
%if %{withhtmldoc}
%patch2 -p1 -b .addhtml
@@ -95,7 +88,9 @@ cd %{pear_name}-%{version}%{?prever}
phing -f docs/build-phing.xml \
-Dhomedir=$PWD \
-Dasciidoc.home=%{_datadir}/asciidoc \
- make-full-docs
+ -Doutput.dir=$PWD/docs \
+ -Dbuild.tarball=false \
+ make-html-docs
# asciidoc fails silently
cpt=$(find docs -name \*.html | wc -l)
@@ -103,9 +98,6 @@ echo "File generated:$cpt, expected:5"
[ $cpt -eq 5 ] || exit 1
%endif
-# restore unpatched docs (for install and checksum)
-mv docs/index.txt.fix docs/index.txt
-
%install
rm -rf %{buildroot}
@@ -129,7 +121,7 @@ cd %{pear_name}-%{version}%{?prever}
# OK (444, Assertions: 8380, Skipped: 7) when all extensions installed
# OK, but incomplete or skipped tests!
-# Tests: 329, Assertions: 5446, Skipped: 133.
+# Tests: 405, Assertions: 5647, Skipped: 159.
# Reference tests need some fixes for EL-4, so ignore result for now
%{_bindir}/phpunit \
-d date.timezone=UTC \
@@ -166,6 +158,9 @@ fi
%changelog
+* Fri Feb 17 2012 Remi Collet <remi at fedoraproject.org> - 2.2.4-1
+- Version 2.2.4 (stable) - API 2.2.0 (stable)
+
* Sat Sep 24 2011 Remi Collet <remi at fedoraproject.org> - 2.1.0-3.1
- no html doc on EL6
diff --git a/sources b/sources
index 123fae4..ca67bff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c9b8dbfae122871db37ba987ca076c8 PHP_CompatInfo-2.1.0.tgz
+be77f0dc16b10750f6d79ad24a305986 PHP_CompatInfo-2.2.4.tgz
More information about the scm-commits
mailing list