diff --git a/cacti.spec b/cacti.spec index 040bdee..0149f8b 100644 --- a/cacti.spec +++ b/cacti.spec @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.8g -Release: 1%{?dist} +Release: 2%{?dist} Summary: An rrd based graphing tool License: GPLv2+ URL: http://www.cacti.net/ @@ -17,11 +17,8 @@ Patch0: cacti-0.8.8a-legal.patch Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp Requires: net-snmp-utils Requires: crontabs -Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -Buildrequires: systemd +Requires(pre): %{_sbindir}/useradd +Requires(postun): /sbin/service Provides: bundled(js-jquery) = 2.2.2 BuildArch: noarch @@ -84,13 +81,14 @@ ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %pre useradd -d %{_datadir}/%{name} -r -s /sbin/nologin cacti 2> /dev/null || : + %post -if [ $1 -eq 1 ] ; then - %systemd_postun_with_restart httpd.service +if [ $1 == 1 ]; then + /sbin/service httpd condrestart > /dev/null 2>&1 || : fi %postun -%systemd_postun_with_restart httpd.service +/sbin/service httpd condrestart > /dev/null 2>&1 || : %files %dir %{_sysconfdir}/%{name} @@ -124,6 +122,9 @@ fi %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Sun Apr 24 2016 Morten Stevens - 0.8.8g-2 +- Spec file changes for el6 + * Fri Apr 15 2016 Morten Stevens - 0.8.8g-1 - Update to 0.8.8g - Improve spec file (#1302904)