diff --git a/cacti.spec b/cacti.spec index 5925d6d..62b2190 100644 --- a/cacti.spec +++ b/cacti.spec @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.8a -Release: 8%{?dist} +Release: 9%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -29,6 +29,11 @@ Requires(pre): %{_sbindir}/useradd Requires(postun): /sbin/service BuildArch: noarch +# This macro was added in Fedora 20. Use the old version if it's undefined +# on older Fedoras and RHELs. +# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -53,7 +58,7 @@ echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/nu %install rm -rf %{buildroot} %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name} -%{__install} -d -m 0755 %{buildroot}/%{_docdir}/%{name}-%{version} +%{__install} -d -m 0755 %{buildroot}/%{_pkgdocdir} %{__install} -d -m 0755 %{buildroot}/%{_datadir}/%{name}/ %{__install} -m 0644 *.php %{buildroot}/%{_datadir}/%{name}/ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ @@ -75,7 +80,7 @@ rm -rf %{buildroot} %{__cp} -a images/ include/ install/ lib/ plugins/ resource/ %{buildroot}%{_datadir}/%{name} %{__cp} %{SOURCE3} ./docs/README.fedora -%{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version} +%{__cp} -a docs/ %{buildroot}/%{_pkgdocdir} %{__mv} %{buildroot}/%{_datadir}/%{name}/include/config.php %{buildroot}/%{_sysconfdir}/%{name}/db.php %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/cmd.php %{buildroot}/%{_datadir}/%{name}/poller.php ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/config.php @@ -132,6 +137,10 @@ fi %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Mon Jul 29 2013 Ken Dreyer - 0.8.8a-9 +- Use %%{_pkgdocdir}, per + https://fedoraproject.org/wiki/Changes/UnversionedDocdirs + * Sun Jul 14 2013 Ken Dreyer - 0.8.8a-8 - Improve security description in cacti's httpd conf (RHBZ #895823) - Use improved treeview replacement patch (RHBZ #888207)