summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-06-20 11:21:18 +0200
committerRemi Collet <fedora@famillecollet.com>2015-06-20 11:21:18 +0200
commitf72c2a026c3ee77df472771982b5d10d53b04a6e (patch)
tree8c9d2aa16e63fbe9dd2558cccd0ad0f28334541b
parentb482e1ea1ccd56aea4180ad4b79b989ecc6cfd35 (diff)
php-pecl-msgpack allow build against "rh-php56" (for more-php56)
-rw-r--r--php-pecl-msgpack-dev.spec17
-rw-r--r--php-pecl-msgpack.spec22
2 files changed, 32 insertions, 7 deletions
diff --git a/php-pecl-msgpack-dev.spec b/php-pecl-msgpack-dev.spec
index 99230d4..1294b38 100644
--- a/php-pecl-msgpack-dev.spec
+++ b/php-pecl-msgpack-dev.spec
@@ -9,6 +9,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-msgpack}
%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
%{!?__pecl: %global __pecl %{_bindir}/pecl}
@@ -34,10 +42,10 @@
%endif
Summary: API for communicating with MessagePack serialization
-Name: %{?scl_prefix}php-pecl-msgpack
+Name: %{?sub_prefix}php-pecl-msgpack
Version: 0.5.7
%if 0%{?gh_date:1}
-Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
%else
Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
%endif
@@ -106,7 +114,7 @@ a perfect replacement.
This extension is still EXPERIMENTAL.
-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})}.
%package devel
@@ -281,6 +289,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.2.20150612git95c8dc3
+- allow build against rh-php56 (as more-php56)
+
* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 0.5.7-0.1.20150612git95c8dc3
- update to 0.5.7dev for PHP 7
- sources from github
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 494d7bb..29fc74b 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -1,4 +1,7 @@
-# spec file for php-pecl-msgpack
+# remirepo spec file for php-pecl-msgpack
+# with SCL compatibility, from:
+#
+# Fedora spec file for php-pecl-msgpack
#
# Copyright (c) 2012-2015 Remi Collet
# License: CC-BY-SA
@@ -6,6 +9,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-msgpack}
%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
%{!?__pecl: %global __pecl %{_bindir}/pecl}
@@ -26,9 +37,9 @@
%endif
Summary: API for communicating with MessagePack serialization
-Name: %{?scl_prefix}php-pecl-msgpack
+Name: %{?sub_prefix}php-pecl-msgpack
Version: 0.5.6
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/msgpack
@@ -97,7 +108,7 @@ a perfect replacement.
This extension is still EXPERIMENTAL.
-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})}.
%package devel
@@ -270,6 +281,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 0.5.6-2
+- allow build against rh-php56 (as more-php56)
+
* Mon Apr 27 2015 Remi Collet <remi@fedoraproject.org> - 0.5.6-1
- Update to 0.5.6
- drop runtime dependency on pear, new scriptlets