summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-06-24 09:31:27 +0200
committerRemi Collet <fedora@famillecollet.com>2015-06-24 09:31:27 +0200
commit12fe2000df4080576a4dd0bc027442bf295d0883 (patch)
tree6006b5cce689bc86aca8f0b393a1c634dc42a45b
parentcbda0959431a8f092d036ab2fa9f60fada9665e6 (diff)
php-pecl-libsodium: allow build against rh-php56 (as more-php56)
-rw-r--r--php-pecl-libsodium.spec20
1 files changed, 16 insertions, 4 deletions
diff --git a/php-pecl-libsodium.spec b/php-pecl-libsodium.spec
index 15e7628..632cc37 100644
--- a/php-pecl-libsodium.spec
+++ b/php-pecl-libsodium.spec
@@ -1,4 +1,4 @@
-# spec file for php-pecl-libsodium
+# remirepo spec file for php-pecl-libsodium
#
# Copyright (c) 2014-2015 Remi Collet
# License: CC-BY-SA
@@ -6,6 +6,14 @@
#
# Please, preserve the changelog entries
#
+%if 0%{?scl:1}
+%if "%{scl}" == "rh-php56"
+%global sub_prefix more-php56-
+%else
+%global sub_prefix %{scl_prefix}
+%endif
+%endif
+
%{?scl: %scl_package php-pecl-libsodium}
%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
%{!?__pecl: %global __pecl %{_bindir}/pecl}
@@ -21,9 +29,9 @@
%endif
Summary: Wrapper for the Sodium cryptographic library
-Name: %{?scl_prefix}php-pecl-%{pecl_name}
+Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 0.1.3
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -77,7 +85,7 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
%description
A simple, low-level PHP extension for libsodium.
-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
@@ -223,6 +231,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 0.1.3-2
+- allow build against rh-php56 (as more-php56)
+- rebuild for "rh_layout" (php70)
+
* Wed Apr 15 2015 Remi Collet <remi@fedoraproject.org> - 0.1.3-1
- Update to 0.1.3 (beta)