[php-bartlett-PHP-CompatInfo] update to 2.5.0

Remi Collet remi at fedoraproject.org
Fri Jun 22 18:23:01 UTC 2012


commit f7e95006131b73874b35e085f67583359419290e
Author: remi <fedora at famillecollet.com>
Date:   Fri Jun 22 20:22:58 2012 +0200

    update to 2.5.0

 .gitignore                       |    1 +
 PHP_CompatInfo-libxml.patch      |   27 ---------------------------
 php-bartlett-PHP-CompatInfo.spec |   27 ++++++++++++++++++---------
 sources                          |    2 +-
 4 files changed, 20 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9350642..6b47ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ package-*.xml
 /PHP_CompatInfo-2.2.5.tgz
 /PHP_CompatInfo-2.3.0.tgz
 /PHP_CompatInfo-2.4.0.tgz
+/PHP_CompatInfo-2.5.0.tgz
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index bd6819e..8f39104 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -13,8 +13,8 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.4.0
-Release:        1%{?dist}.1
+Version:        2.5.0
+Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
 Group:          Development/Libraries
@@ -27,8 +27,7 @@ Source0:        http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%
 Patch1:         %{pear_name}-del.patch
 # Install generated doc using pear command
 Patch2:         %{pear_name}-addhtml.patch
-# For old Libxml version https://github.com/llaville/php-compat-info/pull/36
-Patch3:         %{pear_name}-libxml.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -80,8 +79,6 @@ mv -f ../package.xml %{name}.xml
 %if %{withhtmldoc}
 %patch2 -p1 -b .addhtml
 %endif
-%patch3 -p1 -b .libxml
-sed -i -e 's/md5sum="986d32e2f83eb637448af23424f0fb93"//' %{name}.xml
 
 
 %build
@@ -119,13 +116,18 @@ 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
+# Test:  621, Assertions: 8965, Skipped: 7, when most extensions installed
 # OK, but incomplete or skipped tests!
-# Tests: 405, Assertions: 5647, Skipped: 159.
+# Tests: 441, Assertions: 5720, Skipped: 222, in mock
 # Reference tests need some fixes for EL-4, so ignore result for now
 %{_bindir}/phpunit \
     -d date.timezone=UTC \
@@ -153,7 +155,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}
@@ -162,6 +167,10 @@ fi
 
 
 %changelog
+* Fri Jun 22 2012 Remi Collet <remi at 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 at fedoraproject.org> - 2.4.0-1.1
 - add patch for old libxml
 
diff --git a/sources b/sources
index 0214ce9..b21dcec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce755cb9b12727ad05ddc7156e1179c9  PHP_CompatInfo-2.4.0.tgz
+40d71a55642d6cd2854cb8f34a8b7856  PHP_CompatInfo-2.5.0.tgz


More information about the scm-commits mailing list