diff --git a/.gitignore b/.gitignore index b561f1a..eb84c4b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cacti-1.0.2.tar.gz /cacti-1.0.3.tar.gz /cacti-1.0.4.tar.gz +/cacti-1.0.5.tar.gz diff --git a/cacti.spec b/cacti.spec index 54caacd..2626b7c 100644 --- a/cacti.spec +++ b/cacti.spec @@ -1,5 +1,5 @@ Name: cacti -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: An rrd based graphing tool License: GPLv2+ @@ -10,8 +10,8 @@ Source2: cacti.logrotate Source3: cacti.README.fedora Source4: %{name}.cron -Requires: php, php-ldap, php-mbstring, php-mysqlnd, php-pdo, php-snmp, php-xml -Requires: mariadb +Requires: php, php-gd, php-ldap, php-mbstring, php-mysqlnd, php-pdo, php-process, php-snmp, php-xml +Requires: mariadb Requires: httpd Requires: rrdtool Requires: net-snmp, net-snmp-utils @@ -21,7 +21,7 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Buildrequires: systemd -Provides: bundled(js-jquery) = 2.2.2 +Provides: bundled(js-jquery) = 3.1.0 BuildArch: noarch # This macro was added in Fedora 20. Use the old version if it's undefined @@ -53,7 +53,7 @@ driven. %{__mv} *.php %{buildroot}/%{_datadir}/%{name}/ %{__mv} cache/ %{buildroot}/%{_localstatedir}/lib/%{name}/ %{__mv} cli/ %{buildroot}/%{_localstatedir}/lib/%{name}/ -%{__mv} log/* %{buildroot}/%{_localstatedir}/log/%{name}/ +%{__mv} log/%{name}.log %{buildroot}/%{_localstatedir}/log/%{name}/%{name}.log %{__mv} rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/ %{__mv} scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/ %{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/cron.d/%{name} @@ -100,6 +100,7 @@ fi %dir %{_localstatedir}/lib/%{name}/cli %dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts %dir %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ +%config(noreplace) %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/%{name}.log %config(noreplace) %{_sysconfdir}/cron.d/cacti %config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -121,7 +122,6 @@ fi %{_localstatedir}/lib/%{name}/scripts/*[^p] %attr(-,root,root) %{_localstatedir}/lib/%{name}/scripts/*.php %attr(-,apache,apache) %{_datadir}/%{name}/resource/ -%attr(-,cacti,apache) %{_localstatedir}/log/%{name}/%{name}.log %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cache/ %attr(-,root,root) %{_localstatedir}/lib/%{name}/cli/*php @@ -130,6 +130,11 @@ fi %attr(-,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Mon Mar 13 2017 Morten Stevens - 1.0.5-1 +- Update to 1.0.5 +- Logfile improvements +- Added php-gd and php-process as dependency (#1430893) + * Mon Feb 27 2017 Morten Stevens - 1.0.4-1 - Update to 1.0.4 diff --git a/sources b/sources index 1146b7d..d77725a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cacti-1.0.4.tar.gz) = 2b271ac2d3ec32c69726ac0f0d32de42159eea5d2d4e38dc797c7191e5b91d14114ad89a5eee7fee2808e66f14f0b7ed027f85c2da2e3ec8f3a5aa1b900cea90 +SHA512 (cacti-1.0.5.tar.gz) = a48bb9042cdd62b8a4835e084a43ef681773086d19f4e1bcede29056d01f74274aaf2d81028d00890c892f6c3144c9e2950ae56766ab1277968aca5e4854536c