[php-bartlett-PHP-CompatInfo] update to 3.6.0
Remi Collet
remi at fedoraproject.org
Fri Nov 14 11:42:12 UTC 2014
commit 3d5a0f4fb2c5190b0cb157bc4a1b204e32bef4c0
Author: Remi Collet <remi at fedoraproject.org>
Date: Fri Nov 14 12:42:04 2014 +0100
update to 3.6.0
.gitignore | 1 +
php-bartlett-PHP-CompatInfo-rpm.patch | 14 +++++++-----
php-bartlett-PHP-CompatInfo.spec | 34 +++++++++++++-------------------
sources | 2 +-
4 files changed, 24 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52ccd25..7947bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
/php-compat-info-3.3.0.tar.gz
/php-compat-info-3.4.0.tar.gz
/php-compat-info-3.5.0.tar.gz
+/php-compat-info-3.6.0.tar.gz
diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch
index 3b9f3c7..87bbfe0 100644
--- a/php-bartlett-PHP-CompatInfo-rpm.patch
+++ b/php-bartlett-PHP-CompatInfo-rpm.patch
@@ -22,19 +22,20 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist
],
"analysers" : [
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
---- ./bin/phpcompatinfo.rpm 2014-08-21 21:09:22.000000000 +0200
-+++ ./bin/phpcompatinfo 2014-08-22 08:28:20.750827392 +0200
+--- ./bin/phpcompatinfo.rpm 2014-11-13 15:57:07.000000000 +0100
++++ ./bin/phpcompatinfo 2014-11-13 17:57:48.174914678 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
+#!/usr/bin/php
<?php
ini_set('memory_limit', -1);
-
-@@ -23,7 +23,27 @@ if (\Phar::running()) {
+
+@@ -27,8 +27,28 @@ if (\Phar::running()) {
}
}
}
--require_once $vendorDir . '/autoload.php';
+-$loader = require_once $vendorDir . '/autoload.php';
+-$loader->setUseIncludePath(true);
+$vendorDir = '/usr/share/php';
+require_once $vendorDir . '/PhpParser/Autoloader.php';
+PhpParser\Autoloader::register();
@@ -53,10 +54,11 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
+ 'Symfony\\Component\\Console' => $vendorDir,
+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
+ 'Seld\\JsonLint' => $vendorDir,
++ 'JsonSchema' => $vendorDir,
+ 'Bartlett' => $vendorDir,
+));
+$loader->register();
-
+
if (PHP_SAPI !== 'cli') {
return;
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 8690e47..45d0245 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -6,13 +6,13 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit f537b51e9ca93213a458a1f2ac8d3cc9a4cb0054
+%global gh_commit b29ff9ce621c07b1d511a0a37b1a34a3be7ed95e
#global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner llaville
%global gh_project php-compat-info
Name: php-bartlett-PHP-CompatInfo
-Version: 3.5.0
+Version: 3.6.0
Release: 1%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
@@ -28,7 +28,7 @@ BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
# to run test suite
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-composer(bartlett/php-reflect) >= 2.5
+BuildRequires: php-composer(bartlett/php-reflect) >= 2.6
# From composer.json, "require"
# "php": ">=5.3.0",
@@ -38,22 +38,15 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.5
# "ext-json": "*",
# "symfony/console": "~2.5",
# "bartlett/php-reflect": "~2.5",
-# From phpreflect (implicit dep.)
-# "sebastian/version": "~1.0",
-# "seld/jsonlint": "~1.1"
Requires: php(language) >= 5.3.0
Requires: php-json
Requires: php-libxml
Requires: php-pcre
Requires: php-spl
-Requires: php-composer(bartlett/php-reflect) >= 2.5
+Requires: php-composer(bartlett/php-reflect) >= 2.6
Requires: php-composer(bartlett/php-reflect) < 3
Requires: php-composer(symfony/console) >= 2.5
Requires: php-composer(symfony/console) < 3
-Requires: php-composer(seld/jsonlint) >= 1.1
-Requires: php-composer(seld/jsonlint) < 2
-Requires: php-composer(sebastian/version) >= 1.0
-Requires: php-composer(sebastian/version) < 2
# From composer.json, "suggest"
# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2"
Requires: php-composer(doctrine/cache)
@@ -63,6 +56,9 @@ Requires: php-composer(nikic/php-parser)
Requires: php-composer(symfony/class-loader)
Requires: php-composer(symfony/event-dispatcher)
Requires: php-composer(symfony/finder)
+Requires: php-composer(seld/jsonlint)
+Requires: php-composer(sebastian/version)
+Requires: php-composer(justinrainbow/json-schema)
Provides: phpcompatinfo = %{version}
Provides: php-composer(bartlett/php-compatinfo) = %{version}
@@ -78,7 +74,8 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/
%prep
-%setup -q -n %{gh_project}-%{gh_commit}
+#setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
%patch0 -p1 -b .rpm
@@ -100,15 +97,7 @@ install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/php
%check
-# Not ready (local build with php 5.6 and xcache 4.0-dev)
-rm tests/Reference/Extension/XcacheExtensionTest.php
-
-# fix timeout for koji
-sed -s 's/colors/timeoutForSmallTests="10" colors/' \
- phpunit.xml.dist >phpunit.xml
-
%{_bindir}/phpunit \
- -d date.timezone=UTC \
-d memory_limit=-1 \
%if 0%{?rhel} < 6 && 0%{?fedora} < 8
|| exit 0
@@ -134,6 +123,11 @@ fi
%changelog
+* Thu Nov 13 2014 Remi Collet <remi at fedoraproject.org> - 3.6.0-1
+- Update to 3.6.0
+- add dependency on justinrainbow/json-schema
+- raise dependency on bartlett/php-reflect 2.6
+
* Thu Oct 16 2014 Remi Collet <remi at fedoraproject.org> - 3.5.0-1
- Update to 3.5.0
- add dependency on sebastian/version
diff --git a/sources b/sources
index ca9d30b..d830a00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aebcb30ee46754911998e4900731f67c php-compat-info-3.5.0.tar.gz
+396d23d4c9654714fe7f402314f8a65a php-compat-info-3.6.0.tar.gz
More information about the scm-commits
mailing list