From 61376add1c61da3930445c6b5beafd217f52917f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 5 Mar 2016 14:49:20 +0100 Subject: php-bartlett-php-compatinfo-db: 1.6.0 --- php-bartlett-php-compatinfo-db-1.2.0-rpm.patch | 14 ++++++++++++++ php-bartlett-php-compatinfo-db.spec | 11 +++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/php-bartlett-php-compatinfo-db-1.2.0-rpm.patch b/php-bartlett-php-compatinfo-db-1.2.0-rpm.patch index 33b801b..aa5bd82 100644 --- a/php-bartlett-php-compatinfo-db-1.2.0-rpm.patch +++ b/php-bartlett-php-compatinfo-db-1.2.0-rpm.patch @@ -11,6 +11,20 @@ diff -up ./data/handleDB.php.rpm ./data/handleDB.php require_once __DIR__ . '/ReferenceCollection.php'; use Bartlett\CompatInfoDb\ExtensionFactory; +@@ -238,12 +239,7 @@ class DbInitCommand extends Command + array( + 'build_string' => date('M d Y H:i:s T', $time), + 'build_date' => date('YmdHis', $time), +- 'build_version' => sprintf( +- '%4d.%4d.%6d', +- date('Y', $time), +- date('md', $time), +- date('His', $time) +- ) ++ 'build_version' => "@VERSION@" + ) + ); + $progress->setMessage('Database is built'); diff -up ./src/Bartlett/CompatInfoDb/Environment.php.rpm ./src/Bartlett/CompatInfoDb/Environment.php --- ./src/Bartlett/CompatInfoDb/Environment.php.rpm 2015-12-04 21:15:12.000000000 +0100 +++ ./src/Bartlett/CompatInfoDb/Environment.php 2015-12-05 16:55:03.461056102 +0100 diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index a738f2d..7b8ae8f 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # See https://github.com/llaville/php-compatinfo-db/releases -%global gh_commit 56ccba3bb8ff80fad5e922ad9e5c8d2b5a241462 +%global gh_commit 4dab0fc3da69f0077826b3aced38e04ae81105da %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151031 %global gh_owner llaville @@ -23,7 +23,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{c_vendor}-%{c_project} -Version: 1.5.0 +Version: 1.6.0 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Reference Database to be used with php-compatinfo library @@ -108,6 +108,9 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 cp %{SOURCE1} src/%{ns_vendor}/%{ns_project}/autoload.php +# Use package version +sed -e 's/@VERSION@/%{version}/' -i data/handleDB.php + # Cleanup patched files find src -name \*rpm -delete -print @@ -181,6 +184,10 @@ export BARTLETT_COMPATINFO_DB=%{buildroot}%{_datadir}/%{name}/compatinfo.sqlite %changelog +* Sat Mar 5 2016 Remi Collet - 1.6.0-1 +- update to 1.6.0 +- use package version as version in database instead of date + * Sat Feb 6 2016 Remi Collet - 1.5.0-1 - update to 1.5.0 -- cgit