summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--macros-build2
-rw-r--r--php56.spec20
3 files changed, 16 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 13af741..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../../../common/Makefile
+include ../../common/Makefile
diff --git a/macros-build b/macros-build
index 5f62237..6a9f923 100644
--- a/macros-build
+++ b/macros-build
@@ -1,3 +1,5 @@
+%_sclreq (%{scl_vendor})
+
%scl_package_override() %{expand:
%{?@SCL@___pear:%global __pear %@SCL@___pear}
%{?@SCL@___pecl:%global __pecl %@SCL@___pecl}
diff --git a/php56.spec b/php56.spec
index 03f58d4..9a17aee 100644
--- a/php56.spec
+++ b/php56.spec
@@ -9,7 +9,7 @@
Summary: Package that installs PHP 5.6
Name: %scl_name
-Version: 1.0
+Version: 2.0
Release: 1%{?dist}
Group: Development/Languages
License: GPLv2+
@@ -24,10 +24,10 @@ BuildRequires: help2man
# Temporary work-around
BuildRequires: iso-codes
-Requires: %{?scl_prefix}php-common
-Requires: %{?scl_prefix}php-cli
-Requires: %{?scl_prefix}php-pear
-Requires: %{?scl_name}-runtime
+Requires: %{?scl_prefix}php-common%{?_isa} >= 5.6.0
+Requires: %{?scl_prefix}php-cli%{?_isa}
+Requires: %{?scl_prefix}php-pear >= 1.9.5
+Requires: %{?scl_name}-runtime%{?_isa} = %{version}-%{release}
%description
This is the main package for %scl Software Collection,
@@ -38,6 +38,8 @@ that install PHP 5.5 language.
Summary: Package that handles %scl Software Collection.
Group: Development/Languages
Requires: scl-utils
+Provides: %{?scl_name}-runtime(%{scl_vendor})
+Provides: %{?scl_name}-runtime(%{scl_vendor})%{?_isa}
%description runtime
Package shipping essential scripts to work with %scl Software Collection.
@@ -47,7 +49,7 @@ Package shipping essential scripts to work with %scl Software Collection.
Summary: Package shipping basic build configuration
Group: Development/Languages
Requires: scl-utils-build
-Requires: %{?scl_name}-runtime
+Requires: %{?scl_name}-runtime%{?_isa} = %{version}-%{release}
%description build
Package shipping essential configuration macros
@@ -57,7 +59,7 @@ to build %scl Software Collection.
%package scldevel
Summary: Package shipping development files for %scl
Group: Development/Languages
-Requires: %{?scl_name}-runtime
+Requires: %{?scl_name}-runtime%{?_isa} = %{version}-%{release}
%description scldevel
Package shipping development files, especially usefull for development of
@@ -143,6 +145,10 @@ fi
%changelog
+* Mon Sep 8 2014 Remi Collet <remi@fedoraproject.org> 2.0-1
+- provides php56-runtime(remi)
+- add _sclreq macro
+
* Sun Aug 24 2014 Remi Collet <rcollet@redhat.com> 1.0-1
- initial packaging from php55 from rhscl 1.1
- install macro in /usr/lib/rpm/macros.d