[php-bartlett-PHP-CompatInfo/el6] update to 2.14.1

Tue Apr 9 14:39:56 UTC 2013

commit 0eaa6721a7e46a75c17d06fc59b7892b7c3c0973
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Apr 9 16:39:43 2013 +0200

    update to 2.14.1

 .gitignore                       |    4 ++++
 PHP_CompatInfo-conf.patch        |   18 ++++++++++++++++++
 php-bartlett-PHP-CompatInfo.spec |   36 ++++++++++++++++++++++++------------
 sources                          |    2 +-
 4 files changed, 47 insertions(+), 13 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 84d6f31..c7c81aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,7 @@ package-*.xml
 /PHP_CompatInfo-2.8.1.tgz
 /PHP_CompatInfo-2.11.0.tgz
 /PHP_CompatInfo-2.12.1.tgz
+/PHP_CompatInfo-2.13.0.tgz
+/PHP_CompatInfo-2.13.2.tgz
+/PHP_CompatInfo-2.14.0.tgz
+/PHP_CompatInfo-2.14.1.tgz
diff --git a/PHP_CompatInfo-conf.patch b/PHP_CompatInfo-conf.patch
new file mode 100644
index 0000000..58bd881
--- /dev/null
+++ b/PHP_CompatInfo-conf.patch
@@ -0,0 +1,18 @@
+--- PHP_CompatInfo-2.14.1/phpcompatinfo.xml.dist	2013-04-01 18:17:03.000000000 +0200
++++ PHP_CompatInfo-2.14.1/phpcompatinfo.xml	2013-04-02 10:15:27.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <phpcompatinfo
+-    reference="PHP5"
++    reference="ALL"
+     report="summary"
+     reportFileAppend="false"
+     cacheDriver="file"
+@@ -12,6 +12,7 @@
+ 
+     <cache id="file">
+         <options>
++            <save_path>/tmp/phpci-%{USER}</save_path>
+             <gc_probability>1</gc_probability>
+             <gc_maxlifetime>86400</gc_maxlifetime>
+         </options>
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 5b5a335..420aa3e 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -8,7 +8,7 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.12.1
+Version:        2.14.1
 Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
@@ -18,17 +18,22 @@ License:        BSD and MIT
 URL:            http://php5.laurent-laville.org/compatinfo/
 Source0:        http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%{?prever}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Update configuration for best experience
+# Reference = ALL known extension (instead of installed ones)
+# Make cache / save_path user specific
+Patch0:         %{pear_name}-conf.patch
+
 BuildArch:      noarch
+BuildRequires:  php(language) >= 5.2.1
 BuildRequires:  php-pear(PEAR) >= 1.9.0
 BuildRequires:  php-channel(%{channel})
 # to run test suite
 BuildRequires:  php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
-BuildRequires:  php-pear(%{channel}/PHP_Reflect) >= 1.5.0
+BuildRequires:  php-pear(%{channel}/PHP_Reflect) >= 1.6.1
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.2.1
+Requires:       php(language) >= 5.2.1
 Requires:       php-date
 Requires:       php-dom
 Requires:       php-libxml
@@ -36,7 +41,7 @@ Requires:       php-pcre
 Requires:       php-reflection
 Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.9.0
-Requires:       php-pear(%{channel}/PHP_Reflect) >= 1.5.0
+Requires:       php-pear(%{channel}/PHP_Reflect) >= 1.6.1
 Requires:       php-pear(Console_CommandLine) >= 1.2.0
 # Optional
 Requires:       php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
@@ -44,6 +49,7 @@ Requires:       php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0
 # Optional and not yet availalble php-pear(Net_Growl) >= 2.2.2
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}%{?prever}
+Provides:       phpci = %{version}%{?prever}
 
 
 %description
@@ -60,6 +66,12 @@ HTML Documentation:  %{pear_docdir}/%{pear_name}/html/index.html
 
 # Package is V2
 cd %{pear_name}-%{version}%{?prever}
+
+# Copy upstream default configuration
+cp phpcompatinfo.xml.dist phpcompatinfo.xml
+# Apply our changes
+%patch0  -p1 -b .rpm
+
 mv -f ../package.xml %{name}.xml
 
 
@@ -68,7 +80,6 @@ cd %{pear_name}-%{version}%{?prever}
 
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}%{?prever}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -83,9 +94,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 sed -i -e 's/\r//' %{buildroot}%{_bindir}/phpci
 
 # 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
+install -pm 644 phpcompatinfo.xml %{buildroot}%{pear_cfgdir}/%{pear_name}/
 
 
 %check
@@ -96,8 +105,6 @@ cd %{pear_name}-%{version}%{?prever}
 # 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
-# hash test fails because mhash is not present (emulated by hash)
-rm -f tests/Reference/HashTest.php
 %endif
 
 # Tests: 654, Assertions: 9682, Skipped: 28, when most extensions installed
@@ -127,7 +134,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %dir %{pear_cfgdir}/%{pear_name}
 # Editable configuration
@@ -142,6 +148,12 @@ fi
 
 
 %changelog
+* Tue Apr 02 2013 Remi Collet <remi at fedoraproject.org> - 2.14.1-1
+- Update to 2.14.1
+- make cache path user dependent
+- raise dependencies, PHP_Reflect 1.6.1
+- provides phpci
+
 * Fri Jan 18 2013 Remi Collet <remi at fedoraproject.org> - 2.12.1-1
 - update to Version 2.12.1
 - fix path to documentation in description
diff --git a/sources b/sources
index d6eb7c1..a93b105 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-adce86e1c39481788eead11e51528d2f  PHP_CompatInfo-2.12.1.tgz
+b8202cff7a77058754f3cb09e3dd0ce7  PHP_CompatInfo-2.14.1.tgz
