diff --git a/README.SUSE b/README.SUSE index 913aa93..e3dfe26 100644 --- a/README.SUSE +++ b/README.SUSE @@ -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 a2enmod php7 -apache must be restarted after this +or +a2enmod php5 + +apache2 must be restarted after this + -- cgoll@suse.de diff --git a/ganglia-web.changes b/ganglia-web.changes index bc1ef46..e318615 100644 --- a/ganglia-web.changes +++ b/ganglia-web.changes @@ -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 diff --git a/ganglia-web.spec b/ganglia-web.spec index bf5fcf0..61a771f 100644 --- a/ganglia-web.spec +++ b/ganglia-web.spec @@ -16,8 +16,7 @@ # -# -%define webpath /srv/www/htdocs/ganglia-web +%define web_prefixdir /srv/www/htdocs/ganglia-web Name: ganglia-web Version: 3.7.2 @@ -33,20 +32,20 @@ BuildRequires: apache2 BuildRequires: fdupes BuildRequires: rsync Requires: apache2 -Requires: mod_php_any >= 7 -Requires: php >= 7 -Requires: php-gd >= 7 -Requires: php-xml >= 7 +Requires: mod_php_any +Requires: php +Requires: php-gd +Requires: php-xml Requires: rrdtool Recommends: ganglia-gmetad BuildArch: noarch -%define web_prefixdir /srv/www/htdocs/ganglia-web + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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 -written in the PHP5 language and uses the Dwoo templating engine. +written in the PHP5/7 language and uses the Dwoo templating engine. %prep %setup -q @@ -55,8 +54,8 @@ cp %SOURCE2 . %install %{__sed} -i 's,www-data,abuild,' Makefile -%{__sed} -i 's,/usr/share/ganglia-webfrontend,%{buildroot}%{webpath},' Makefile -%{__sed} -i 's,WEBPATH,%{webpath},' %SOURCE1 +%{__sed} -i 's,/usr/share/ganglia-webfrontend,%{buildroot}%{web_prefixdir},' Makefile +%{__sed} -i 's,WEBPATH,%{web_prefixdir},' %SOURCE1 %{__sed} -i 's,/etc/ganglia-web,%{buildroot}/etc/apache2/conf.d,' Makefile %{__sed} -i 's,/var/lib/ganglia,%{buildroot}/var/lib/ganglia,' Makefile