rpms/cacti/F-9 cacti.spec,1.21,1.22

[Mike McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32231/F-9

Modified Files:
	cacti.spec 
Log Message:
added CLI dir


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-9/cacti.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cacti.spec	9 Mar 2008 02:43:59 -0000	1.21
+++ cacti.spec	30 Jul 2008 21:07:34 -0000	1.22
@@ -1,10 +1,11 @@
 Name: cacti
 Version: 0.8.7b
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
-License: GPL
+# There's a lot of stuff in there. It's all compatible.
+License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD)
 URL: http://www.cacti.net/
 Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 Source1: cacti-httpd.conf
@@ -43,6 +44,8 @@
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
 %{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib//%{name}/cli/
+%{__install} -m 0755 cli/* %{buildroot}/%{_localstatedir}/lib/%{name}/cli/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti
@@ -96,10 +99,20 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/cli/*php
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Mon Jul 28 2008 Mike McGrath <mmcgrath at redhat.com> - 0.8.7b-4
+- Added cli directory
+
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7b-3
+- fix my own mistake in the license tag
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.7b-2
+- fix license tag
+
 * Thu Feb 14 2008 Mike McGrath <mmcgrath at redhat.com> - 0.8.7b-1
 - Upstream released new version