Add plugins directory (BZ #834355)
- Drop Fedora 15 (EOL) from logrotate syntax adjustment
This commit is contained in:
parent
51c056ef13
commit
08df79d670
11
cacti.spec
11
cacti.spec
@ -1,6 +1,6 @@
|
||||
Name: cacti
|
||||
Version: 0.8.8a
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: An rrd based graphing tool
|
||||
|
||||
Group: Applications/System
|
||||
@ -52,11 +52,11 @@ rm -rf %{buildroot}
|
||||
|
||||
# The su parameter will trip up older logrotate versions.
|
||||
# Conditionally remove it here.
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 15) || (0%{?rhel} && 0%{?rhel} <= 6)
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
sed -i %{buildroot}/%{_sysconfdir}/logrotate.d/cacti -e '/^[ \t]*su /d'
|
||||
%endif
|
||||
|
||||
%{__cp} -a images/ include/ install/ lib/ resource/ %{buildroot}%{_datadir}/%{name}
|
||||
%{__cp} -a images/ include/ install/ lib/ plugins/ resource/ %{buildroot}%{_datadir}/%{name}
|
||||
%{__cp} %{SOURCE3} ./docs/README.cacti
|
||||
%{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version}
|
||||
%{__mv} %{buildroot}/%{_datadir}/%{name}/include/config.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
|
||||
@ -101,6 +101,7 @@ fi
|
||||
%{_datadir}/%{name}/install/
|
||||
%{_datadir}/%{name}/lib/
|
||||
%{_datadir}/%{name}/log
|
||||
%{_datadir}/%{name}/plugins/
|
||||
%{_datadir}/%{name}/resource/
|
||||
%{_datadir}/%{name}/rra
|
||||
%{_datadir}/%{name}/scripts
|
||||
@ -114,6 +115,10 @@ fi
|
||||
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
||||
|
||||
%changelog
|
||||
* Thu Jun 28 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8a-2
|
||||
- Add plugins directory (BZ #834355)
|
||||
- Drop Fedora 15 (EOL) from logrotate syntax adjustment
|
||||
|
||||
* Mon Apr 30 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8a-1
|
||||
- New upstream release (BZ #817506)
|
||||
- Drop upstreamed $url_path patch
|
||||
|
Loading…
Reference in New Issue
Block a user