[php-bartlett-PHP-CompatInfo/el6] update to 2.19.0
Remi Collet
remi at fedoraproject.org
Fri Jul 12 13:56:33 UTC 2013
commit 316e48efafb163e0159eefba80e60eb1f69177ea
Author: Remi Collet <rcollet at redhat.com>
Date: Fri Jul 12 15:43:52 2013 +0200
update to 2.19.0
.gitignore | 2 +
PHP_CompatInfo-conf.patch | 14 +++++-
PHP_CompatInfo-intl.patch | 83 ++++++++++++++++++++++++++++++++++++++
php-bartlett-PHP-CompatInfo.spec | 32 ++++++++++----
sources | 2 +-
5 files changed, 120 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b44bfe9..39f0762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ package-*.xml
/PHP_CompatInfo-2.15.0.tgz
/PHP_CompatInfo-2.16.0.tgz
/PHP_CompatInfo-2.17.0.tgz
+/PHP_CompatInfo-2.18.0.tgz
+/PHP_CompatInfo-2.19.0.tgz
diff --git a/PHP_CompatInfo-conf.patch b/PHP_CompatInfo-conf.patch
index a66a4a8..2aa82ae 100644
--- a/PHP_CompatInfo-conf.patch
+++ b/PHP_CompatInfo-conf.patch
@@ -1,6 +1,14 @@
---- 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
-@@ -12,6 +12,7 @@
+--- PHP_CompatInfo-2.19.0/phpcompatinfo.xml.dist 2013-07-11 22:21:27.000000000 +0200
++++ PHP_CompatInfo-2.19.0/phpcompatinfo.xml 2013-07-12 08:22:34.529605184 +0200
+@@ -5,13 +5,14 @@
+ reportFileAppend="false"
+ cacheDriver="file"
+ recursive="false"
+- fileExtensions="php, inc, phtml"
++ fileExtensions="php, inc, phtml, module, install"
+ consoleProgress="true"
+ verbose="false"
+ >
<cache id="file">
<options>
diff --git a/PHP_CompatInfo-intl.patch b/PHP_CompatInfo-intl.patch
new file mode 100644
index 0000000..73abe74
--- /dev/null
+++ b/PHP_CompatInfo-intl.patch
@@ -0,0 +1,83 @@
+diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php
+index 64a088f..6266150 100644
+--- a/PHP/CompatInfo/Reference/intl.php
++++ b/PHP/CompatInfo/Reference/intl.php
+@@ -342,6 +342,10 @@ class PHP_CompatInfo_Reference_Intl
+ => array('5.5.0', ''),
+ 'intlcal_get_minimum' => array('5.5.0', ''),
+ 'intlcal_get_now' => array('5.5.0', ''),
++ 'intlcal_get_repeated_wall_time_option'
++ => array('5.5.0', ''),
++ 'intlcal_get_skipped_wall_time_option'
++ => array('5.5.0', ''),
+ 'intlcal_get_time' => array('5.5.0', ''),
+ 'intlcal_get_time_zone' => array('5.5.0', ''),
+ 'intlcal_get_type' => array('5.5.0', ''),
+@@ -355,6 +359,10 @@ class PHP_CompatInfo_Reference_Intl
+ 'intlcal_set' => array('5.5.0', ''),
+ 'intlcal_set_first_day_of_week' => array('5.5.0', ''),
+ 'intlcal_set_lenient' => array('5.5.0', ''),
++ 'intlcal_set_repeated_wall_time_option'
++ => array('5.5.0', ''),
++ 'intlcal_set_skipped_wall_time_option'
++ => array('5.5.0', ''),
+ 'intlcal_set_time' => array('5.5.0', ''),
+ 'intlcal_set_time_zone' => array('5.5.0', ''),
+ 'intlcal_to_date_time' => array('5.5.0', ''),
+@@ -377,6 +385,7 @@ class PHP_CompatInfo_Reference_Intl
+ 'intltz_get_offset' => array('5.5.0', ''),
+ 'intltz_get_raw_offset' => array('5.5.0', ''),
+ 'intltz_get_region' => array('5.5.0', ''),
++ 'intltz_get_unknown' => array('5.5.0', ''),
+ 'intltz_get_tz_data_version' => array('5.5.0', ''),
+ 'intltz_has_same_rules' => array('5.5.0', ''),
+ 'intltz_to_date_time_zone' => array('5.5.0', ''),
+diff --git a/tests/Reference/IntlTest.php b/tests/Reference/IntlTest.php
+index 8636f4f..22c1717 100644
+--- a/tests/Reference/IntlTest.php
++++ b/tests/Reference/IntlTest.php
+@@ -51,13 +51,6 @@ class PHP_CompatInfo_Reference_IntlTest
+ if (PATH_SEPARATOR == ';') {
+ // Win*
+ $this->optionalclasses = array('IntlException');
+- $this->ignoredfunctions = array(
+- 'intltz_get_unknown',
+- 'intlcal_get_repeated_wall_time_option',
+- 'intlcal_get_skipped_wall_time_option',
+- 'intlcal_set_repeated_wall_time_option',
+- 'intlcal_set_skipped_wall_time_option',
+- );
+ }
+
+ if (version_compare(INTL_ICU_VERSION, '3.8.0', 'lt')) {
+@@ -70,6 +63,30 @@ class PHP_CompatInfo_Reference_IntlTest
+ );
+ }
+
++ if (version_compare(INTL_ICU_VERSION, '4.8', 'lt')) {
++ // requires libicu >= 4.8
++ $this->optionalfunctions = array_merge(
++ $this->optionalfunctions,
++ array(
++ 'intltz_create_time_zone_id_enumeration',
++ 'intltz_get_region',
++ )
++ );
++ }
++ if (version_compare(INTL_ICU_VERSION, '49', 'lt')) {
++ // requires libicu >= 49 (version scheme change 4.9 become 49)
++ $this->optionalfunctions = array_merge(
++ $this->optionalfunctions,
++ array(
++ 'intltz_get_unknown',
++ 'intlcal_get_repeated_wall_time_option',
++ 'intlcal_get_skipped_wall_time_option',
++ 'intlcal_set_repeated_wall_time_option',
++ 'intlcal_set_skipped_wall_time_option',
++ )
++ );
++ }
++
+ /*
+ On Windows platform extension intl 1.1.0 :
+ - uses libicu 4.6.1 for PHP 5.4.1 or greater
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 3caecdf..4d48797 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -16,8 +16,8 @@
Name: php-bartlett-PHP-CompatInfo
-Version: 2.17.0
-Release: 2%{?dist}
+Version: 2.19.0
+Release: 1%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
Group: Development/Libraries
@@ -30,15 +30,19 @@ Source1: https://raw.github.com/llaville/php-compat-info/master/misc/phpc
# Update configuration for best experience
# Reference = ALL known extension (instead of installed ones)
# Make cache / save_path user specific
+# Add .install .module to fileExtensions (for drupal)
Patch0: %{pear_name}-conf.patch
+# https://github.com/llaville/php-compat-info/pull/95
+Patch1: %{pear_name}-intl.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.6.2
+BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.7.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -50,7 +54,7 @@ Requires: php-pcre
Requires: php-reflection
Requires: php-spl
Requires: php-pear(PEAR) >= 1.9.0
-Requires: php-pear(%{channel}/PHP_Reflect) >= 1.6.2
+Requires: php-pear(%{channel}/PHP_Reflect) >= 1.7.0
Requires: php-pear(Console_CommandLine) >= 1.2.0
# Optional
Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
@@ -74,7 +78,6 @@ HTML Documentation: %{pear_docdir}/%{pear_name}/html/index.html
%prep
%setup -q -c
-# Package is V2
cd %{pear_name}-%{version}%{?prever}
# Copy upstream default configuration
@@ -82,7 +85,12 @@ cp phpcompatinfo.xml.dist phpcompatinfo.xml
# Apply our changes
%patch0 -p1 -b .rpm
-mv -f ../package.xml %{name}.xml
+%patch1 -p1 -b .ref
+
+# remove checksum for patched files
+sed -e '/intl.php/s/md5sum.*name/name/' \
+ -e '/IntlTest.php/s/md5sum.*name/name/' \
+ ../package.xml >%{name}.xml
%build
@@ -122,10 +130,10 @@ cd %{pear_name}-%{version}%{?prever}
rm -f tests/Reference/XslTest.php
%endif
-# Tests: 654, Assertions: 9682, Skipped: 28, when most extensions installed
# OK, but incomplete or skipped tests!
-# Tests: 462, Assertions: 5936, Skipped: 254, in mock
-# Reference tests need some fixes for EL-4, so ignore result for now
+# Tests: 816, Assertions: 11365, Skipped: 72, when most extensions installed
+# Tests: 550, Assertions: 6834, Skipped: 378, in mock
+# Reference tests need some fixes for EL-5, so ignore result for now
%{_bindir}/phpunit \
-d date.timezone=UTC \
-d memory_limit=-1 \
@@ -165,6 +173,12 @@ fi
%changelog
+* Fri Jul 12 2013 Remi Collet <remi at fedoraproject.org> - 2.19.0-1
+- Update to 2.19.0
+- add module and install to fileExtensions in default configuration
+ for drupal packages, #979830
+- raise dependencies, PHP_Reflect 1.7.0
+
* Fri Jun 07 2013 Remi Collet <remi at fedoraproject.org> - 2.17.0-2
- keep phpci command for now
diff --git a/sources b/sources
index 9c1de53..b766037 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b0c9894ade6af8deb9fb3578071c56c PHP_CompatInfo-2.17.0.tgz
+9a4150faf2f4ee236cba6e82b4bbd77c PHP_CompatInfo-2.19.0.tgz
More information about the scm-commits
mailing list