Update to 1.0.5

This commit is contained in:
Morten Stevens 2017-03-13 19:03:51 +01:00
parent 94ae710721
commit c9ff3f43ac
3 changed files with 13 additions and 7 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/cacti-1.0.2.tar.gz /cacti-1.0.2.tar.gz
/cacti-1.0.3.tar.gz /cacti-1.0.3.tar.gz
/cacti-1.0.4.tar.gz /cacti-1.0.4.tar.gz
/cacti-1.0.5.tar.gz

View File

@ -1,5 +1,5 @@
Name: cacti Name: cacti
Version: 1.0.4 Version: 1.0.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: An rrd based graphing tool Summary: An rrd based graphing tool
License: GPLv2+ License: GPLv2+
@ -10,7 +10,7 @@ Source2: cacti.logrotate
Source3: cacti.README.fedora Source3: cacti.README.fedora
Source4: %{name}.cron Source4: %{name}.cron
Requires: php, php-ldap, php-mbstring, php-mysqlnd, php-pdo, php-snmp, php-xml Requires: php, php-gd, php-ldap, php-mbstring, php-mysqlnd, php-pdo, php-process, php-snmp, php-xml
Requires: mariadb Requires: mariadb
Requires: httpd Requires: httpd
Requires: rrdtool Requires: rrdtool
@ -21,7 +21,7 @@ Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Buildrequires: systemd Buildrequires: systemd
Provides: bundled(js-jquery) = 2.2.2 Provides: bundled(js-jquery) = 3.1.0
BuildArch: noarch BuildArch: noarch
# This macro was added in Fedora 20. Use the old version if it's undefined # 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} *.php %{buildroot}/%{_datadir}/%{name}/
%{__mv} cache/ %{buildroot}/%{_localstatedir}/lib/%{name}/ %{__mv} cache/ %{buildroot}/%{_localstatedir}/lib/%{name}/
%{__mv} cli/ %{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} rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/
%{__mv} scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/ %{__mv} scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/
%{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/cron.d/%{name} %{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/cron.d/%{name}
@ -100,6 +100,7 @@ fi
%dir %{_localstatedir}/lib/%{name}/cli %dir %{_localstatedir}/lib/%{name}/cli
%dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts %dir %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/scripts
%dir %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %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}/cron.d/cacti
%config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@ -121,7 +122,6 @@ fi
%{_localstatedir}/lib/%{name}/scripts/*[^p] %{_localstatedir}/lib/%{name}/scripts/*[^p]
%attr(-,root,root) %{_localstatedir}/lib/%{name}/scripts/*.php %attr(-,root,root) %{_localstatedir}/lib/%{name}/scripts/*.php
%attr(-,apache,apache) %{_datadir}/%{name}/resource/ %attr(-,apache,apache) %{_datadir}/%{name}/resource/
%attr(-,cacti,apache) %{_localstatedir}/log/%{name}/%{name}.log
%attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cache/ %attr(-,apache,apache) %{_localstatedir}/lib/%{name}/cache/
%attr(-,root,root) %{_localstatedir}/lib/%{name}/cli/*php %attr(-,root,root) %{_localstatedir}/lib/%{name}/cli/*php
@ -130,6 +130,11 @@ fi
%attr(-,root,root) %{_localstatedir}/lib/%{name}/lib %attr(-,root,root) %{_localstatedir}/lib/%{name}/lib
%changelog %changelog
* Mon Mar 13 2017 Morten Stevens <mstevens@fedoraproject.org> - 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 <mstevens@fedoraproject.org> - 1.0.4-1 * Mon Feb 27 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.0.4-1
- Update to 1.0.4 - Update to 1.0.4

View File

@ -1 +1 @@
SHA512 (cacti-1.0.4.tar.gz) = 2b271ac2d3ec32c69726ac0f0d32de42159eea5d2d4e38dc797c7191e5b91d14114ad89a5eee7fee2808e66f14f0b7ed027f85c2da2e3ec8f3a5aa1b900cea90 SHA512 (cacti-1.0.5.tar.gz) = a48bb9042cdd62b8a4835e084a43ef681773086d19f4e1bcede29056d01f74274aaf2d81028d00890c892f6c3144c9e2950ae56766ab1277968aca5e4854536c