php-bartlett-PHP-CompatInfo: sync with rawhide

4 files changed, 97 insertions, 115 deletions

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 523f76d..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.deljs PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml
---- PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.deljs	2011-08-24 20:39:25.000000000 +0200
-+++ PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml	2011-09-21 17:41:03.925086384 +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,39 +14,3 @@ diff -up PHP_CompatInfo-2.1.0/php-bartlett-PHP-CompatInfo.xml.deljs PHP_CompatIn
     <file baseinstalldir="Bartlett" md5sum="16cfb6e94de43a22241c92bed60d02c2" name="docs/styles/flask.css" role="doc">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
-@@ -736,9 +730,6 @@ Bug fixes:
-    <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 +739,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 +760,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_CompatInfo-docs.patch b/PHP_CompatInfo-docs.patch
deleted file mode 100644
index 9b548a7..0000000
--- a/PHP_CompatInfo-docs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up PHP_CompatInfo-2.1.0/docs/index.txt.orig PHP_CompatInfo-2.1.0/docs/index.txt
---- PHP_CompatInfo-2.1.0/docs/index.txt.orig	2011-08-25 08:24:54.198681536 +0200
-+++ PHP_CompatInfo-2.1.0/docs/index.txt	2011-08-25 08:29:10.706968690 +0200
-@@ -167,28 +167,23 @@ Will output results as follow. May diffe
- The PHP_CompatInfo manual is available in a selection of formats. Pick a format
- from the table below to start downloading.
- 
--[grid="rows",format="csv"]
- [options="header"]
- |===========================
--Language,Single HTML file,Many HTML files,HTML Help file (CHM),PDF file
--English, link:{man_dir}/en/pci-book.html.zip[pci-book.html.zip] 529Kb, link:{man_dir}/en/phpci-book.chunked.zip[phpci-book.chunked.zip] 464Kb , link:{man_dir}/en/phpci-book.chm.zip[phpci-book.chm.zip] 469Kb, link:{man_dir}/en/phpci-book.pdf[phpci-book.pdf] 512Kb
-+| Language | Single HTML file | Many HTML files | HTML Help file (CHM) | PDF file
-+| English | link:{man_dir}/en/pci-book.html.zip[pci-book.html.zip] 529Kb | link:{man_dir}/en/phpci-book.chunked.zip[phpci-book.chunked.zip] 464Kb | link:{man_dir}/en/phpci-book.chm.zip[phpci-book.chm.zip] 469Kb | link:{man_dir}/en/phpci-book.pdf[phpci-book.pdf] 512Kb
- |===========================
- 
--[appendix]
--Changelog
-----------
-+== Appendix A: Changelog
-+
- link:CHANGELOG.html[History of changes]
- 
--[appendix]
--License
---------
-+== Appendix B: License
-+
- Released under the link:LICENSE.html[BSD] license,
- you are free to do whatever you want, even in a commercial environment.
- You are also encouraged to contribute.
- 
--[appendix]
--Credits
---------
-+== Appendix C: Credits
- 
- I would like to thanks here specially a guy without who this PHP QA tool
- won't be born.
-@@ -214,9 +209,8 @@ on version 2.0.0RC2
- ____
- 
- 
--[appendix]
--Links
-------
-+== Appendix D: Links
-+
- All pages of this site, and user guide were generated with AsciiDoc 8.6.5,
- assisted by FOP 1.0 (for PDFs). Automated build process uses Phing 2.4.5
- 
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 148e2af..ee25ea0 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name   PHP_CompatInfo
 %global channel     bartlett.laurent-laville.org
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 15
 %global withhtmldoc 1
 %else
 %global withhtmldoc 0
@@ -13,8 +14,8 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.1.0
-Release:        3%{?dist}
+Version:        2.8.1
+Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
 Group:          Development/Libraries
@@ -23,23 +24,19 @@ 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
-# source7813.php => PHP License
-# source13873.php => GPL
-# and tests which use this files.
-Patch1:         PHP_CompatInfo-del.patch
+Patch1:         %{pear_name}-del.patch
 # Install generated doc using pear command
-Patch2:         PHP_CompatInfo-addhtml.patch
+Patch2:         %{pear_name}-addhtml.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 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(pear.phpunit.de/PHPUnit) >= 3.6.0
+BuildRequires:  php-pear(%{channel}/PHP_Reflect) >= 1.4.2
 %if %{withhtmldoc}
 # to build HTML documentation
 BuildRequires:  php-pear(pear.phing.info/phing)
@@ -50,7 +47,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
@@ -79,7 +76,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
@@ -94,7 +90,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)
@@ -102,9 +100,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}
@@ -112,7 +107,7 @@ cd %{pear_name}-%{version}%{?prever}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
@@ -122,13 +117,25 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 sed -i -e 's/\r//' %{buildroot}%{_bindir}/phpci
 sed -i -e 's/\r//' %{buildroot}%{pear_docdir}/%{pear_name}/README.markdown
 
+# Create default package configuration
+sed -e '/reference=/s/PHP5/ALL/' \
+     %{buildroot}%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml.dist \
+    >%{buildroot}%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml
+
 
 %check
 cd %{pear_name}-%{version}%{?prever}
 
-# OK (444, Assertions: 8380, Skipped: 7) when all extensions installed
+%if 0%{?rhel} == 6
+# php-5.3.3-CVE-2012-0057.patch add new constants from php 5.3.9
+# so drop this test which fails with
+# Constant 'XSL_SECPREF_CREATE_DIRECTORY', found in Reference (5.3.9,), exists.
+rm -f tests/Reference/XslTest.php
+%endif
+
+# Tests: 654, Assertions: 9682, Skipped: 28, when most extensions installed
 # OK, but incomplete or skipped tests!
-# Tests: 329, Assertions: 5446, Skipped: 133.
+# Tests: 462, Assertions: 5936, Skipped: 254, in mock
 # Reference tests need some fixes for EL-4, so ignore result for now
 %{_bindir}/phpunit \
     -d date.timezone=UTC \
@@ -156,7 +163,10 @@ fi
 %defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %dir %{pear_cfgdir}/%{pear_name}
-%config(noreplace) %{pear_cfgdir}/%{pear_name}/*dist
+# Editable configuration
+%config(noreplace) %{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml
+# Default configuration
+%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml.dist
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Bartlett/PHP/Compat*
 %{pear_testdir}/%{pear_name}
@@ -165,6 +175,66 @@ fi
 
 
 %changelog
+* Sat Sep 29 2012 Remi Collet <remi@fedoraproject.org> - 2.8.1-1
+- Version 2.8.1 (stable) - API 2.8.0 (stable)
+
+* Mon Sep 17 2012 Remi Collet <remi@fedoraproject.org> - 2.8.0-1
+- Version 2.8.0 (stable) - API 2.8.0 (stable)
+- new extensions : amqp, geoip, inclued, xcache
+
+* Mon Sep  3 2012 Remi Collet <remi@fedoraproject.org> - 2.7.0-1
+- Version 2.7.0 (stable) - API 2.7.0 (stable)
+
+* Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-3
+- rebuilt for new pear_datadir
+
+* Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-2
+- rebuildt for new pear_testdir
+
+* Wed Aug 01 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
+- Version 2.6.0 (stable) - API 2.6.0 (stable)
+- raise dependencies: PHPUnit 3.6.0, PHP_Reflect 1.4.2
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jul  8 2012 Remi Collet <remi@fedoraproject.org> - 2.5.0-1.1
+- drop XslTest in EL-6
+
+* Fri Jun 22 2012 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
+- Version 2.5.0 (stable) - API 2.5.0 (stable)
+- use reference="ALL" in provided config
+
+* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.4.0-1.1
+- add patch for old libxml
+
+* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- Version 2.4.0 (stable) - API 2.3.0 (stable)
+
+* Mon Mar 05 2012 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
+- Version 2.3.0 (stable) - API 2.3.0 (stable)
+
+* Sat Feb 25 2012 Remi Collet <remi@fedoraproject.org> - 2.2.5-1
+- Version 2.2.5 (stable) - API 2.2.0 (stable)
+
+* Fri Feb 17 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
+- Version 2.2.4 (stable) - API 2.2.0 (stable)
+
+* Tue Feb 14 2012 Remi Collet <remi@fedoraproject.org> - 2.2.3-1
+- Version 2.2.3 (stable) - API 2.2.0 (stable)
+
+* Thu Feb 09 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
+- Version 2.2.2 (stable) - API 2.2.0 (stable)
+
+* Sun Feb 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
+- Version 2.2.1 (stable) - API 2.2.0 (stable)
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Sep 24 2011 Remi Collet <remi@fedoraproject.org> - 2.1.0-3.1
+- no html doc on EL6
+
 * Wed Sep 21 2011 Remi Collet <remi@fedoraproject.org> - 2.1.0-3
 - remove all files with licensing issue
   don't use it during test, don't install it