From 0c2e83040283c22c114f58a727865a32a215744b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 21 Jun 2015 09:46:11 +0200 Subject: php-twig: allow build against "rh-php56" (for more-php56) --- php-twig.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/php-twig.spec b/php-twig.spec index 09c6bcb..7af3043 100644 --- a/php-twig.spec +++ b/php-twig.spec @@ -38,6 +38,11 @@ %if 0%{?scl:1} # PHPUnit not available in SCL %global with_tests 0 +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{scl_prefix} +%endif %else # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -49,9 +54,9 @@ %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__php: %global __php %{_bindir}/php} -Name: %{?scl_prefix}php-%{composer_project} +Name: %{?sub_prefix}php-%{composer_project} Version: %{github_version} -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: The flexible, fast, and secure template engine for PHP Group: Development/Libraries @@ -157,7 +162,7 @@ Obsoletes: php70w-%{ext_name} <= %{version} developer to define its own custom tags and filters, and create its own DSL. -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. %prep @@ -281,6 +286,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 19 2015 Remi Collet - 1.18.2-3 +- allow build against rh-php56 (as more-php56) + * Mon Jun 15 2015 Remi Collet - 1.18.2-2 - rebuild for remirepo with rawhide changes (autoloader) -- cgit