packages: cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp...

[glen]

Author: glen                         Date: Mon Oct 25 07:36:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- require cacti with fixed php dep instead of workarounds
- use %cacti_import_template
- rel 2

---- Files affected:
packages/cacti-template-snmp_tcp_connection_status:
   cacti-template-snmp_tcp_connection_status.sh (1.7 -> 1.8) , cacti-template-snmp_tcp_connection_status.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh
diff -u packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.7 packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.8
--- packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.7	Fri Oct 23 16:19:31 2009
+++ packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh	Mon Oct 25 09:36:23 2010
@@ -17,8 +17,8 @@
 timeout=${3:-10}
 retry=5
 
-# handle case when template was imported with <> getting lost
-if [ -z "$hostname" -o "$hostname" = "hostcommunity" ]; then # WTF
+# parse required args
+if [ -z "$hostname" ]; then
 	echo >&2 "Usage: $PROGRAM HOSTNAME [SNMP_COMMUNITY] [TIMEOUT]"
 	exit 1
 fi

================================================================
Index: packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec
diff -u packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec:1.6 packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec:1.7
--- packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec:1.6	Sun May 16 16:13:41 2010
+++ packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec	Mon Oct 25 09:36:23 2010
@@ -5,7 +5,7 @@
 Summary:	TCP Connection Status template for Cacti
 Name:		cacti-template-%{template}
 Version:	0.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 # Source0Download: http://forums.cacti.net/download.php?id=5198
@@ -14,10 +14,10 @@
 Source1:	%{name}.sh
 Source2:	tcpstat
 URL:		http://forums.cacti.net/viewtopic.php?t=12766
+BuildRequires:	rpmbuild(macros) >= 1.554
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
-Requires:	cacti >= 0.8.6j
-Requires:	cacti-add_template
+Requires:	cacti >= 0.8.7e-9
 Requires:	net-snmp-utils
 Obsoletes:	cacti-plugin-snmp_tcp_connection_status
 BuildArch:	noarch
@@ -50,7 +50,7 @@
 SNMPd agent to provide TCP Connection statistics.
 
 %prep
-%setup -q -c
+%setup -qc
 %{__sed} -i -e 's,/bin/bash /var/www/htdocs/cacti/scripts/get_tcp_connections,%{scriptsdir}/%{template},' *.xml
 
 %install
@@ -61,7 +61,7 @@
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/snmpd-agent-tcpstat
 
 %post
-%{_sbindir}/cacti-add_template %{resourcedir}/cacti_graph_template_tcp_connections.xml
+%cacti_import_template %{resourcedir}/cacti_graph_template_tcp_connections.xml
 
 %post -n net-snmp-agent-tcpstat
 if ! grep -qF %{snmpoid} %{snmpdconfdir}/snmpd.local.conf; then
@@ -95,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/10/25 07:36:23  glen
+- require cacti with fixed php dep instead of workarounds
+- use %cacti_import_template
+- rel 2
+
 Revision 1.6  2010/05/16 14:13:41  sparky
 - BR: unzip
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.spec?r1=1.6&r2=1.7&f=u