packages: cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec, cacti-plugin-rr...

glen glen at pld-linux.org
Tue Dec 14 08:38:24 CET 2010


Author: glen                         Date: Tue Dec 14 07:38:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.40
- add backup and archive dirs
- updated deps

---- Files affected:
packages/cacti-plugin-rrdclean:
   cacti-plugin-rrdclean.spec (1.8 -> 1.9) , paths.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec
diff -u packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec:1.8 packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec:1.9
--- packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec:1.8	Sun Oct  5 13:18:07 2008
+++ packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec	Tue Dec 14 08:38:19 2010
@@ -1,40 +1,39 @@
 # $Revision$, $Date$
-%define		plugin	rrdclean
-%include	/usr/lib/rpm/macros.perl
-Summary:	Plugin for Cacti - RRDClean
-Summary(pl.UTF-8):	Wtyczka do Cacti - RRDClean
-Name:		cacti-plugin-RRDClean
-Version:	0.32
-Release:	1
+%define		plugin rrdclean
+Summary:	Cacti RRD File Cleaner
+Name:		cacti-plugin-%{plugin}
+Version:	0.40
+Release:	0.3
 License:	GPL v2
 Group:		Applications/WWW
-# source from:http://forums.cacti.net/about5852.html
-Source0:	%{plugin}-%{version}.tgz
-# Source0-md5:	eb14850dbc27efce52939dae59b71d0d
-URL:		http://cactiusers.org/wiki/RRDCleanDocs
-BuildRequires:	rpm-perlprov
-Requires:	cacti
+Source0:	http://docs.cacti.net/_media/plugin:rrdclean-v%{version}.tgz
+# Source0-md5:	afd7ae246482fbee883485e0430041e8
+Patch0:		paths.patch
+URL:		http://docs.cacti.net/plugin:rrdclean
+Requires:	cacti >= 0.8.6j
+Requires:	php-common >= 3:4.3.0
+Provides:	cacti(pia) >= 2.8
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		cactidir		/usr/share/cacti
 %define		plugindir		%{cactidir}/plugins/%{plugin}
+%define		rradir			/var/lib/cacti/rra
 
 %description
-RRDClean - Backup or Delete unused RRD files from the rra cacti folder
-with the click of a button.
-
-%description -l pl.UTF-8
-Wtyczka do Cacti RRDClean - tworzenie kopii zapasowej lub usuwanie
-nieużywanych plików RRD z folderu cacti rra za naciśnięciem przycisku.
+This plugin analyzes many cacti db structures to determine unused rrd
+files.
 
 %prep
-%setup -q -n %{plugin}
+%setup -qc
+mv %{plugin}/* .; rmdir %{plugin}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{plugindir}
+install -d $RPM_BUILD_ROOT{%{plugindir},%{rradir}/{backup,archive}}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
+%{__rm} $RPM_BUILD_ROOT%{plugindir}/{README,LICENSE}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +42,8 @@
 %defattr(644,root,root,755)
 %doc README
 %{plugindir}
+%attr(770,root,http) %dir %{rradir}/archive
+%attr(770,root,http) %dir %{rradir}/backup
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -50,6 +51,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/12/14 07:38:19  glen
+- up to 0.40
+- add backup and archive dirs
+- updated deps
+
 Revision 1.8  2008/10/05 11:18:07  glen
 - simplify macros and cleanups
 

================================================================
Index: packages/cacti-plugin-rrdclean/paths.patch
diff -u /dev/null packages/cacti-plugin-rrdclean/paths.patch:1.1
--- /dev/null	Tue Dec 14 08:38:24 2010
+++ packages/cacti-plugin-rrdclean/paths.patch	Tue Dec 14 08:38:19 2010
@@ -0,0 +1,19 @@
+--- rrdclean/setup.php~	2010-06-07 18:44:42.000000000 +0300
++++ rrdclean/setup.php	2010-12-14 08:43:16.951919734 +0200
+@@ -143,14 +143,14 @@
+ 			"friendly_name" => "Backup directory",
+ 			"description" => "This is the directory where rrd files are <strong>copied</strong> for <strong>Backup</strong>",
+ 			"method" => "dirpath",
+-			"default" => $config["base_path"] . "/rra/backup/",
++			"default" => "/var/lib/cacti/rra/backup",
+ 			"max_length" => 255,
+ 		),
+ 		"rrd_archive" => array(
+ 			"friendly_name" => "Archive directory",
+ 			"description" => "This is the directory where rrd files are <strong>moved</strong> for <strong>Archive</strong>",
+ 			"method" => "dirpath",
+-			"default" => $config["base_path"] . "/rra/archive/",
++			"default" => "/var/lib/cacti/rra/archive",
+ 			"max_length" => 255,
+ 		)
+ 		);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-plugin-rrdclean/cacti-plugin-rrdclean.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list