packages: cacti/cacti.spec, cacti/cacti-PA.patch (REMOVED), cacti/cacti-pa....
glen
glen at pld-linux.org
Mon Jan 23 17:39:07 CET 2012
Author: glen Date: Mon Jan 23 16:39:07 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.8.7i; use consolidated PIA tarball; requires boost 5.x according to changelog
---- Files affected:
packages/cacti:
cacti.spec (1.147 -> 1.148) , cacti-PA.patch (1.7 -> NONE) (REMOVED), cacti-pa.sql (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.147 packages/cacti/cacti.spec:1.148
--- packages/cacti/cacti.spec:1.147 Sat Nov 12 18:56:59 2011
+++ packages/cacti/cacti.spec Mon Jan 23 17:39:02 2012
@@ -1,30 +1,19 @@
# $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without pa # without plugin archidecture patch
-
-%define pia_ver 3.0
-%include /usr/lib/rpm/macros.perl
+%define pia_ver 3.1
Summary: Cacti is a PHP frontend for rrdtool
Summary(pl.UTF-8): Cacti - frontend w PHP do rrdtoola
Name: cacti
-Version: 0.8.7h
-Release: 3
-License: GPL
+Version: 0.8.7i
+Release: 1
+License: GPL v2
Group: Applications/WWW
-Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 58c9371341f49a190ae11a85118e598d
+Source0: http://www.cacti.net/downloads/%{name}-%{version}-PIA-%{pia_ver}.tar.gz
+# Source0-md5: 669770a7837986971a279104dbb50b75
Source2: %{name}.crontab
Source3: %{name}-apache.conf
Source4: %{name}-lighttpd.conf
Source5: %{name}-rrdpath.sql
-Source6: %{name}-pa.sql
Source7: %{name}.logrotate
-# http://docs.cacti.net/manual:087:1_installation.9_pia
-Source8: http://www.cacti.net/downloads/pia/%{name}-plugin-%{version}-PA-v%{pia_ver}.tar.gz
-# Source8-md5: 1f45a65dc76dee368b11f2c78ae89dfb
-# NOTE: update provides: cacti(pia) when updating the patch
-Patch0: %{name}-PA.patch
Patch1: %{name}-config.patch
Patch2: %{name}-adodb.patch
Patch3: %{name}-ioerror.patch
@@ -34,14 +23,15 @@
Patch7: %{name}-ss_disk-array-indices.patch
Patch8: host_name-url.patch
# http://www.cacti.net/download_patches.php
-#Patch10: none now
+Patch10: http://www.cacti.net/downloads/patches/%{version}/settings_checkbox.patch
+# Patch10-md5: 930e6c18b692fb94a19ddbd95a529a8b
URL: http://www.cacti.net/
-BuildRequires: rpm-perlprov
BuildRequires: sed >= 4.0
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
Requires: adodb >= 4.67-1.17
+Requires: cacti-plugin-boost >= 5.0
Requires: crondaemon
Requires: group(http)
Requires: net-snmp-utils
@@ -123,16 +113,9 @@
Dokumentacja do Cacti w formacie HTML.
%prep
-%setup -q %{?with_pa:-a8}
+%setup -q -n %{name}-%{version}-PIA-%{pia_ver}
# official patches
-#%patch10 -p1
-
-%if %{with pa}
-%patch0 -p1
-# copy images and drop the rest
-mv cacti-plugin-arch/files/images/* images
-%{__rm} -r cacti-plugin-arch
-%endif
+%patch10 -p1
%patch1 -p1
%patch2 -p1
@@ -147,7 +130,6 @@
mv *.sql sql
# you should run this sql if your database contains path to %{_datadir}...
cp -p %{SOURCE5} sql
-cp -p %{SOURCE6} sql
%{__rm} -r lib/adodb
%{__rm} log/.htaccess
@@ -285,6 +267,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.148 2012/01/23 16:39:02 glen
+- up to 0.8.7i; use consolidated PIA tarball; requires boost 5.x according to changelog
+
Revision 1.147 2011/11/12 17:56:59 arekm
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.147&r2=1.148&f=u
More information about the pld-cvs-commit
mailing list