packages: cacti/cacti.spec - install PA icons

[glen]

Author: glen                         Date: Tue Dec 14 06:24:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install PA icons

---- Files affected:
packages/cacti:
   cacti.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.136 packages/cacti/cacti.spec:1.137
--- packages/cacti/cacti.spec:1.136	Tue Dec 14 06:51:39 2010
+++ packages/cacti/cacti.spec	Tue Dec 14 07:24:48 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Cacti - frontend w PHP do rrdtoola
 Name:		cacti
 Version:	0.8.7g
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -20,8 +20,8 @@
 Source6:	%{name}-pa.sql
 Source7:	%{name}.logrotate
 # http://docs.cacti.net/manual:087:1_installation.9_pia
-# http://mirror.cactiusers.org/downloads/plugins/cacti-plugin-0.8.7g-PA-v2.8.tar.gz
-# update provides: cacti(pia) when updating the patch
+Source8:	http://mirror.cactiusers.org/downloads/plugins/%{name}-plugin-%{version}-PA-v2.8.tar.gz
+# NOTE: update provides: cacti(pia) when updating the patch
 Patch0:		%{name}-PA.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-adodb.patch
@@ -126,7 +126,7 @@
 Dokumentacja do Cacti w formacie HTML.
 
 %prep
-%setup -q
+%setup -q %{?with_pa:-a8}
 # official patches
 %patch10 -p1
 %patch11 -p1
@@ -136,7 +136,12 @@
 %patch15 -p1
 %patch16 -p1
 
-%{?with_pa:%patch0 -p1}
+%if %{with pa}
+%patch0 -p1
+# copy images and drop the rest
+mv cacti-plugin-arch/files-%{version}/images/* images
+%{__rm} -r cacti-plugin-arch
+%endif
 
 %patch1 -p1
 %patch2 -p1
@@ -286,6 +291,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2010/12/14 06:24:48  glen
+- install PA icons
+
 Revision 1.136  2010/12/14 05:51:39  glen
 - cacti(pia) provide for Cacti Plugin Architecture version dep
 
================================================================

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