Accepting request 595662 from network:cluster

- Removed all explicit php dependencies (bsc#1088887)
  * updated README.SUSE (forwarded request 595660 from mslacken)

OBS-URL: https://build.opensuse.org/request/show/595662
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ganglia-web?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2018-04-16 10:47:52 +00:00 committed by Git OBS Bridge
commit 1070bec5de
3 changed files with 25 additions and 11 deletions

View File

@ -1,5 +1,11 @@
You need to enable the apache2 php7 module, before ganglia-web works. You need to enable the apache2 php7 or php5 module, before ganglia-web works.
SLE-12* is shipped with php5 and SLE-15* is shipped with php7, for this
products you also have to add the "Web and Scripting Module".
This can be done with This can be done with
a2enmod php7 a2enmod php7
apache must be restarted after this or
a2enmod php5
apache2 must be restarted after this
-- cgoll@suse.de -- cgoll@suse.de

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 10 14:53:10 UTC 2018 - cgoll@suse.com
- Removed all explicit php dependencies (bsc#1088887)
* updated README.SUSE
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 16 11:20:02 UTC 2017 - cgoll@suse.com Mon Oct 16 11:20:02 UTC 2017 - cgoll@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ganglia-web # spec file for package ganglia-web
# #
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -14,7 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define webpath /srv/www/htdocs/ganglia-web
%define web_prefixdir /srv/www/htdocs/ganglia-web
Name: ganglia-web Name: ganglia-web
Version: 3.7.2 Version: 3.7.2
@ -26,24 +28,24 @@ Url: http://ganglia.info/
Source0: https://downloads.sourceforge.net/project/ganglia/ganglia-web/3.7.2/ganglia-web-3.7.2.tar.gz Source0: https://downloads.sourceforge.net/project/ganglia/ganglia-web/3.7.2/ganglia-web-3.7.2.tar.gz
Source1: ganglia-httpd24.conf.d Source1: ganglia-httpd24.conf.d
Source2: README.SUSE Source2: README.SUSE
BuildRequires: fdupes
BuildRequires: apache2 BuildRequires: apache2
BuildRequires: fdupes
BuildRequires: rsync BuildRequires: rsync
Requires: php >= 7 Requires: apache2
Requires: mod_php_any Requires: mod_php_any
Requires: php
Requires: php-gd Requires: php-gd
Requires: php-xml Requires: php-xml
Requires: rrdtool Requires: rrdtool
Requires: apache2
Recommends: ganglia-gmetad Recommends: ganglia-gmetad
BuildArch: noarch BuildArch: noarch
%define web_prefixdir /srv/www/htdocs/ganglia-web
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This package provides a web frontend to display the XML tree published by This package provides a web frontend to display the XML tree published by
ganglia, and to provide historical graphs of collected metrics. This website is ganglia, and to provide historical graphs of collected metrics. This website is
written in the PHP5 language and uses the Dwoo templating engine. written in the PHP5/7 language and uses the Dwoo templating engine.
%prep %prep
%setup -q %setup -q
@ -52,8 +54,8 @@ cp %SOURCE2 .
%install %install
%{__sed} -i 's,www-data,abuild,' Makefile %{__sed} -i 's,www-data,abuild,' Makefile
%{__sed} -i 's,/usr/share/ganglia-webfrontend,%{buildroot}%{webpath},' Makefile %{__sed} -i 's,/usr/share/ganglia-webfrontend,%{buildroot}%{web_prefixdir},' Makefile
%{__sed} -i 's,WEBPATH,%{webpath},' %SOURCE1 %{__sed} -i 's,WEBPATH,%{web_prefixdir},' %SOURCE1
%{__sed} -i 's,/etc/ganglia-web,%{buildroot}/etc/apache2/conf.d,' Makefile %{__sed} -i 's,/etc/ganglia-web,%{buildroot}/etc/apache2/conf.d,' Makefile
%{__sed} -i 's,/var/lib/ganglia,%{buildroot}/var/lib/ganglia,' Makefile %{__sed} -i 's,/var/lib/ganglia,%{buildroot}/var/lib/ganglia,' Makefile