[icinga-checkins] icinga.org: icinga-web/r1.8: icinga-web.spec: fix wrong reqs with php-xml/ dom/etc

git at icinga.org git at icinga.org
Wed Feb 6 14:11:49 CET 2013


Module: icinga-web
Branch: r1.8
Commit: 1d6d061cc7d16c3d57775a62f7d122a5829c5985
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=1d6d061cc7d16c3d57775a62f7d122a5829c5985

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Feb  6 14:10:07 2013 +0100

icinga-web.spec: fix wrong reqs with php-xml/dom/etc

refs #2610

---

 icinga-web.spec |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/icinga-web.spec b/icinga-web.spec
index 0dae930..1abb26d 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -8,7 +8,13 @@
 %define logdir %{_localstatedir}/log/%{name}
 %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
 
 # on RHEL5 php is php-5.1 and php53 is php-5.3
 # icinga-web requires at least php-5.2.3 so
@@ -55,31 +61,46 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: %{phpname} >= 5.2.3
 BuildRequires: %{phpname}-gd
-BuildRequires: %{phpname}-xml
 BuildRequires: %{phpname}-ldap
 BuildRequires: %{phpname}-pdo
-BuildRequires: %{phpname}-dom
 
+%if "%{_vendor}" == "redhat"
+BuildRequires: %{phpname}-xml
 BuildRequires: php-pear
+%endif
+%if "%{_vendor}" == "suse"
+BuildRequires: %{phpname}-devel >= 5.2.3 
+BuildRequires: %{phpname}-json
+BuildRequires: %{phpname}-sockets
+BuildRequires: %{phpname}-xsl
+BuildRequires: %{phpname}-dom
+BuildRequires: %{phpname}-pear
+%endif
+
 
 Requires: perl(Locale::PO)
 Requires: %{phpname} >= 5.2.3
 Requires: %{phpname}-gd
-Requires: %{phpname}-xml
 Requires: %{phpname}-ldap
 Requires: %{phpname}-pdo
-Requires: %{phpname}-dom
 %if "%{_vendor}" == "redhat"
 Requires: %{phpname}-common
+Requires: %{phpname}-xml
+Requires: php-pear
 %endif
 %if "%{_vendor}" == "suse"
+Requires: %{phpname}-pear
 Requires: %{phpname}-xsl
+Requires: %{phpname}-dom
+Requires: %{phpname}-tokenizer
+Requires: %{phpname}-gettext
+Requires: %{phpname}-ctype
+Requires: %{phpname}-json
+Requires: %{phpname}-pear
 Requires: apache2-mod_php5
 %endif
-Requires: %{phpname}-spl
 Requires: pcre >= 7.6
 
-Requires: php-pear
 
 ##############################
 %description
@@ -274,6 +295,7 @@ fi
 * Mon Jan 28 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.2-1
 - bump to 1.8.2
 - fix php5-pear reqs
+- fix php5-dom (suse), php-xml (rhel) and other missing/faulty reqs
 
 * Fri Jan 25 2013 Christian Dengler <christian.dengler at netways.de> - 1.8.1-2
 - add BuildRequires; add subpackage for nagiosbp





More information about the icinga-checkins mailing list