packages: cacti/cacti.spec - up to 0.8.7g, pa patch needs updating (not ava...

[glen]

Author: glen                         Date: Mon Jul 12 09:37:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.8.7g, pa patch needs updating (not available on website)

---- Files affected:
packages/cacti:
   cacti.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.124 packages/cacti/cacti.spec:1.125
--- packages/cacti/cacti.spec:1.124	Fri May 28 10:05:35 2010
+++ packages/cacti/cacti.spec	Mon Jul 12 11:36:58 2010
@@ -1,14 +1,18 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	pa		# without plugin archidecture patch
+
 %include	/usr/lib/rpm/macros.perl
 Summary:	Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):	Cacti - frontend w PHP do rrdtoola
 Name:		cacti
-Version:	0.8.7f
-Release:	1
+Version:	0.8.7g
+Release:	0.1
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	c50a49e3b439dba1fd44ddc34276d4df
+# Source0-md5:	268421cb1a58d3444f7ecbddb4c4b016
 Source1:	%{name}.cfg.php
 Source2:	%{name}.crontab
 Source3:	%{name}-apache.conf
@@ -113,7 +117,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%{?with_pa:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -135,6 +139,7 @@
 rm -f log/.htaccess
 rm -f cli/.htaccess
 rm -f rra/.placeholder
+rm -f rra/.htaccess
 
 # must require libs to get fatals on missing files, not include
 %{__sed} -i -e '
@@ -151,7 +156,6 @@
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-
 # make sure cacti runs out of the box
 sed -e "s,new_install,%{version}," -i sql/cacti.sql
 
@@ -261,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2010/07/12 09:36:58  glen
+- up to 0.8.7g, pa patch needs updating (not available on website)
+
 Revision 1.124  2010/05/28 08:05:35  zawadaa
 - up to 0.8.7f
 - works for me
================================================================

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