Accepting request 595660 from home:mslacken

- Removed all explicit php dependencies (bsc#1088887)
  * updated README.SUSE

OBS-URL: https://build.opensuse.org/request/show/595660
OBS-URL: https://build.opensuse.org/package/show/network:cluster/ganglia-web?expand=0&rev=11
This commit is contained in:
2018-04-11 12:45:06 +00:00
committed by Git OBS Bridge
parent 092e6acabc
commit 6e9af47e88
3 changed files with 20 additions and 14 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,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 10 14:53:10 UTC 2018 - eich@suse.com Tue Apr 10 14:53:10 UTC 2018 - cgoll@suse.com
- Make sure all php components are for PHP7 (bsc#1088887). - 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

@@ -16,8 +16,7 @@
# #
# %define web_prefixdir /srv/www/htdocs/ganglia-web
%define webpath /srv/www/htdocs/ganglia-web
Name: ganglia-web Name: ganglia-web
Version: 3.7.2 Version: 3.7.2
@@ -33,20 +32,20 @@ BuildRequires: apache2
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: rsync BuildRequires: rsync
Requires: apache2 Requires: apache2
Requires: mod_php_any >= 7 Requires: mod_php_any
Requires: php >= 7 Requires: php
Requires: php-gd >= 7 Requires: php-gd
Requires: php-xml >= 7 Requires: php-xml
Requires: rrdtool Requires: rrdtool
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
@@ -55,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