diff options
| -rw-r--r-- | php-bartlett-PHP-CompatInfo-upstream.patch | 24 | ||||
| -rw-r--r-- | php-bartlett-PHP-CompatInfo.spec | 14 |
2 files changed, 6 insertions, 32 deletions
diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch deleted file mode 100644 index dfbac43..0000000 --- a/php-bartlett-PHP-CompatInfo-upstream.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bcd5f85c93653ea2ba06b7a246b0b4778217c0f9 Mon Sep 17 00:00:00 2001 -From: Laurent Laville <laurent.laville@gmail.com> -Date: Wed, 7 Oct 2015 21:52:18 +0200 -Subject: [PATCH] fix for issue GH-210 - ---- - src/Bartlett/CompatInfo/Analyser/CompatibilityAnalyser.php | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/Bartlett/CompatInfo/Analyser/CompatibilityAnalyser.php b/src/Bartlett/CompatInfo/Analyser/CompatibilityAnalyser.php -index a79f05e..3577ed5 100644 ---- a/src/Bartlett/CompatInfo/Analyser/CompatibilityAnalyser.php -+++ b/src/Bartlett/CompatInfo/Analyser/CompatibilityAnalyser.php -@@ -1221,5 +1221,10 @@ private function computeInternalVersions(Node $node, $element, $context, $extra - - // update parent context - $this->updateContextVersion($versions); -+ -+ if ($versions['ext.name'] !== 'user') { -+ // update versions of extension's $element -+ $this->updateElementVersion('extensions', $versions['ext.name'], $versions); -+ } - } - } diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 91e5eaa..724f8e5 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 31d781af6cf6113db85da8838bf25eb73e7b093e +%global gh_commit e4c5d42dce0820f59939bc7fbd2a8995bac66000 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,8 +16,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.5.0 -%global specrel 2 +Version: 4.5.1 +%global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -35,10 +35,6 @@ Source2: %{name}-autoload.php # Autoload and sqlite database path Patch0: %{name}-4.5.0-rpm.patch -# Upstream patch for missing extensions -# https://github.com/llaville/php-compat-info/issues/210 -Patch1: %{name}-upstream.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.2 %if %{with_tests} @@ -111,7 +107,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ #setup -q -n %{gh_project}-%{version} %patch0 -p1 -b .rpm -%patch1 -p1 cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files @@ -175,6 +170,9 @@ fi %changelog +* Sun Oct 11 2015 Remi Collet <remi@fedoraproject.org> - 4.5.1-1 +- update to 4.5.1 + * Thu Oct 8 2015 Remi Collet <remi@fedoraproject.org> - 4.5.0-2 - add upstream patch for missing extensions https://github.com/llaville/php-compat-info/issues/210 |