summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-06-23 13:42:16 +0200
committerRemi Collet <fedora@famillecollet.com>2015-06-23 13:42:16 +0200
commit00635a8f697c45d25d6064cfac19e85e74501a73 (patch)
tree664b24388cf18b9b46e17a466e6df4e453a6da3b
parent1f80e814d11936b8609926de1028ad5ce4c8d167 (diff)
libmemcached-last: allow build against rh-php56 (as more-php56)
-rw-r--r--libmemcached-last.spec34
1 files changed, 26 insertions, 8 deletions
diff --git a/libmemcached-last.spec b/libmemcached-last.spec
index 0b6564b..6582573 100644
--- a/libmemcached-last.spec
+++ b/libmemcached-last.spec
@@ -1,4 +1,7 @@
-# spec file for libmemcached
+# remirepo spec file for libmemcached-last and <scl>-libmemcached
+# renamed for parallel/SCL installation, from:
+#
+# Fedora spec file for libmemcached
#
# Copyright (c) 2009-2015 Remi Collet
# License: CC-BY-SA
@@ -15,15 +18,27 @@
# libmemcached >= 1.0.16 have soname 11
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
# Standard build
-Name: %{libname}
+Name: %{libname}
+
+%else
+# Build for parallel install - SCL
+%if 0%{?scl:1}
+%if "%{scl}" == "rh-php56"
+%global sub_prefix more-php56-
+%else
+%global sub_prefix %{scl_prefix}
+%endif
+Name: %{sub_prefix}%{libname}
+
%else
-# Build for parallel install
-%{?scl:Name: %{scl_prefix}%{libname}}
-%{!?scl:Name: %{libname}-last}
+# Build for parallel install - last
+Name: %{libname}-last
+%endif
%endif
+
Summary: Client library and command line tools for memcached server
Version: 1.0.18
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/System
URL: http://libmemcached.org/
@@ -48,7 +63,7 @@ BuildRequires: systemtap-sdt-devel
%endif
%if 0%{?scl:1}
-BuildRequires: %{scl_prefix}libevent-devel > 2
+BuildRequires: %{sub_prefix}libevent-devel > 2
%else
BuildRequires: libevent-devel > 2
%if "%{libname}" != "%{name}"
@@ -114,7 +129,7 @@ Group: System Environment/Libraries
%if 0%{?scl:1}
Requires: %{scl}-runtime
-Requires: %{scl_prefix}libevent%{_isa} > 2
+Requires: %{sub_prefix}libevent%{_isa} > 2
Requires: openssl%{?_isa}
Requires: libstdc++%{?_isa}
%if %{with_sasl}
@@ -252,6 +267,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Jun 23 2015 Remi Collet <remi@fedoraproject.org> - 1.0.18-5
+- allow build against rh-php56 (as more-php56)
+
* Tue Mar 25 2014 Remi Collet <remi@fedoraproject.org> - 1.0.18-4
- improve SCL build