[icinga-checkins] icinga.org: icinga-web/feature/sles-pkg-5094: Fix PHP package name on SLES.

git at icinga.org git at icinga.org
Mon Nov 18 13:27:40 CET 2013


Module: icinga-web
Branch: feature/sles-pkg-5094
Commit: cd92ecac3deac896722d865a4ec55c4b900efdc8
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=cd92ecac3deac896722d865a4ec55c4b900efdc8

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Mon Nov 18 12:06:35 2013 +0100

Fix PHP package name on SLES.

Refs #5094

---

 icinga-web.spec |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/icinga-web.spec b/icinga-web.spec
index 0c9b4a8..7c4c6d4 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -9,12 +9,7 @@
 %define cachedir %{_localstatedir}/cache/%{name}
 %define reportingcachedir %{_localstatedir}/cache/%{name}/reporting
 
-%if "%{_vendor}" == "suse"
-%define phpname php5
-%endif
-%if "%{_vendor}" == "redhat"
 %define phpname php
-%endif
 
 # el5 requires newer php53 rather than php (5.1)
 %if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
@@ -63,6 +58,7 @@ BuildRequires:  php-pear
 %endif
 %if "%{_vendor}" == "suse"
 Requires:       %{phpname}-devel >= 5.2.3
+BuildRequires:  php5-devel
 BuildRequires:  %{phpname}-json
 BuildRequires:  %{phpname}-sockets
 BuildRequires:  %{phpname}-xsl
@@ -90,7 +86,7 @@ Requires:       %{phpname}-gettext
 Requires:       %{phpname}-ctype
 Requires:       %{phpname}-json
 Requires:       %{phpname}-pear
-Requires:       apache2-mod_php5
+Requires:       apache2-mod_%{phpname}
 %endif
 
 





More information about the icinga-checkins mailing list