summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-10-05 09:21:03 +0200
committerRemi Collet <remi@remirepo.net>2020-10-05 09:21:03 +0200
commit09511e9a197f0cf429590871cbc4def6658b35cf (patch)
tree5a3f992154ce139002e9ed422322c8b32bb95a7b
parent7f2361027129aa067c6668e687c81de3393c5199 (diff)
update to 2.19.0
-rw-r--r--php-bartlett-php-compatinfo-db-2.19-rpm.patch (renamed from php-bartlett-php-compatinfo-db-2.16-rpm.patch)9
-rw-r--r--php-bartlett-php-compatinfo-db.spec10
2 files changed, 6 insertions, 13 deletions
diff --git a/php-bartlett-php-compatinfo-db-2.16-rpm.patch b/php-bartlett-php-compatinfo-db-2.19-rpm.patch
index f9a67e1..1d1d2f5 100644
--- a/php-bartlett-php-compatinfo-db-2.16-rpm.patch
+++ b/php-bartlett-php-compatinfo-db-2.19-rpm.patch
@@ -71,15 +71,6 @@ diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Conso
use Psr\Container\ContainerInterface;
use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
-@@ -30,7 +28,7 @@ use PDO;
- class Application extends \Symfony\Component\Console\Application
- {
- public const NAME = 'Database handler for CompatInfo';
-- public const VERSION = '2.x-dev';
-+ public const VERSION = '@VERSION@';
-
- /** @var string */
- private $baseDir;
@@ -40,20 +38,7 @@ class Application extends \Symfony\Compo
public function __construct(ContainerInterface $container, string $version = 'UNKNOWN')
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index 94fa9d4..de8629f 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,12 +7,12 @@
# Please, preserve the changelog entries
#
# See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit da956e8c1d845a6710310e9a619ca549ba39ed83
+%global gh_commit 4bc78f3103014c65f598162055838a1abee939fe
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151031
%global gh_owner llaville
%global gh_project php-compatinfo-db
-%global upstream_version 2.18.0
+%global upstream_version 2.19.0
#global upstream_prever RC1
# Namespace
%global ns_vendor Bartlett
@@ -41,7 +41,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
# Fix autoloader path
# Fix sqlite database path
# Fix version and avoir composer/package-versions-deprecated (relying on composer.lock)
-Patch0: %{name}-2.16-rpm.patch
+Patch0: %{name}-2.19-rpm.patch
# CURL_SSLVERSION constants have been backported
Patch1: %{name}-curltls.patch
@@ -165,7 +165,6 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
EOF
# Use package version
-sed -e 's/@VERSION@/%{upstream_version}%{?upstream_prever}/' -i src/Presentation/Console/Application.php
grep "%{version}" src/Presentation/Console/Application.php
# Cleanup patched files
@@ -272,6 +271,9 @@ exit $ret
%changelog
+* Mon Oct 5 2020 Remi Collet <remi@remirepo.net> - 2.19.0-1
+- update to 2.19.0
+
* Mon Sep 14 2020 Remi Collet <remi@remirepo.net> - 2.18.0-1
- update to 2.18.0