summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-22 14:45:28 +0200
committerRemi Collet <remi@remirepo.net>2019-10-22 14:45:28 +0200
commit064b8e28291c081076126e70eae57efad424a8a7 (patch)
tree2fc4c72ae78c30d74920b4940eba4e60b5ea570a
parenta03e33d8cb4b91960494440d4f8ee99d16473dc3 (diff)
v5.2.1 (no change)
-rw-r--r--php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch (renamed from php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch)8
-rw-r--r--php-bartlett-PHP-CompatInfo.spec11
2 files changed, 12 insertions, 7 deletions
diff --git a/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch
index d8a8fb7..e7ed3f5 100644
--- a/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch
+++ b/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch
@@ -24,7 +24,7 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
--- ./bin/phpcompatinfo.rpm 2018-11-28 08:53:47.258278539 +0100
+++ ./bin/phpcompatinfo 2018-11-28 08:55:38.807878501 +0100
-@@ -1,40 +1,22 @@
+@@ -1,42 +1,22 @@
#!/usr/bin/env php
<?php
$appName = 'phpCompatInfo';
@@ -55,7 +55,9 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
return;
}
--if (\Phar::running()) {
+-$compatInfoDbV1 = class_exists(Bartlett\CompatInfoDb\Environment::class);
+-
+-if (\Phar::running() && $compatInfoDbV1) {
- try {
- Bartlett\CompatInfoDb\Environment::checkRequirements();
- } catch (\RuntimeException $e) {
@@ -68,6 +70,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
Environment::setScanDir();
--$application = new Application($appName, '5.1');
+-$application = new Application($appName, '5.2.1');
+$application = new Application($appName, '@package_version@');
$application->run();
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 8e9ff60..4325ee6 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -11,7 +11,7 @@
%undefine __brp_mangle_shebangs
%{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-%global gh_commit b54d10946b0f10d67be0faffb5dee24d687effd3
+%global gh_commit 287d879f1b85f49faffdca89088a6b7bffb535d9
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151005
%global gh_owner llaville
@@ -26,12 +26,11 @@
%endif
Name: php-bartlett-PHP-CompatInfo
-Version: 5.2.0
+Version: 5.2.1
%global specrel 1
Release: %{?gh_date:1%{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
-Group: Development/Libraries
License: BSD
URL: http://php5.laurent-laville.org/compatinfo/
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
@@ -43,7 +42,7 @@ Source1: fedora-review-check
Source2: %{name}-5.1.0-autoload.php
# Autoload and sqlite database path
-Patch0: %{name}-5.1.0-rpm.patch
+Patch0: %{name}-5.2.1-rpm.patch
BuildArch: noarch
BuildRequires: php(language) >= 5.5
@@ -205,6 +204,7 @@ fi
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json README.*
@@ -216,6 +216,9 @@ fi
%changelog
+* Tue Oct 22 2019 Remi Collet <remi@remirepo.net> - 5.2.1-1
+- update to 5.2.1 (no change)
+
* Mon Jun 3 2019 Remi Collet <remi@remirepo.net> - 5.2.0-1
- update to 5.2.0
- allow bartlett/php-compatinfo-db v2