[packages/php/PHP_7_0] sqlite no longer separately versioned

glen glen at pld-linux.org
Tue Nov 28 00:40:22 CET 2017


commit 7e71df4592a0c257e193dade9d55673b727d2cf1
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Nov 28 01:26:32 2017 +0200

    sqlite no longer separately versioned

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 5e0f672..872baac 100644
--- a/php.spec
+++ b/php.spec
@@ -312,7 +312,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		intlver		1.1.0
 %define		jsonver		1.4.0
 %define		pharver		2.0.2
-%define		sqlite3ver	0.7-dev
+%define		sqlite3ver	%{version}
 %define		zipver		1.13.5
 %define		phpdbgver	0.5.0
 
@@ -2148,8 +2148,8 @@ if test "$ver" != "%{pharver}"; then
 	: Update the pharver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
-if test "$ver" != "%{sqlite3ver}"; then
+ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
 	: Update the sqlite3ver macro and rebuild.
 	exit 1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/94c580294355daa96185b736d1ae851c73e3f3a8



More information about the pld-cvs-commit mailing list