SPECS: cacti-plugin-boost.spec, cacti-plugin-configmanager.spec, cacti-plug...

Sun Oct 5 13:18:16 CEST 2008

Author: glen                         Date: Sun Oct  5 11:18:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplify macros and cleanups

---- Files affected:
SPECS:
   cacti-plugin-boost.spec (1.3 -> 1.4) , cacti-plugin-configmanager.spec (1.8 -> 1.9) , cacti-plugin-devices.spec (1.6 -> 1.7) , cacti-plugin-discovery.spec (1.13 -> 1.14) , cacti-plugin-flowview.spec (1.8 -> 1.9) , cacti-plugin-hostinfo.spec (1.7 -> 1.8) , cacti-plugin-links.spec (1.7 -> 1.8) , cacti-plugin-mactrack.spec (1.7 -> 1.8) , cacti-plugin-manage.spec (1.4 -> 1.5) , cacti-plugin-monitor.spec (1.12 -> 1.13) , cacti-plugin-npc.spec (1.14 -> 1.15) , cacti-plugin-ntop.spec (1.6 -> 1.7) , cacti-plugin-passwd.spec (1.2 -> 1.3) , cacti-plugin-pollperf.spec (1.6 -> 1.7) , cacti-plugin-reports.spec (1.7 -> 1.8) , cacti-plugin-rrdclean.spec (1.7 -> 1.8) , cacti-plugin-settings.spec (1.4 -> 1.5) , cacti-plugin-ssl.spec (1.3 -> 1.4) , cacti-plugin-superlinks.spec (1.5 -> 1.6) , cacti-plugin-syslog.spec (1.14 -> 1.15) , cacti-plugin-thold.spec (1.16 -> 1.17) , cacti-plugin-tools.spec (1.9 -> 1.10) , cacti-plugin-update.spec (1.9 -> 1.10) , cacti-plugin-weathermap.spec (1.6 -> 1
 .7) 

---- Diffs:

================================================================
Index: SPECS/cacti-plugin-boost.spec
diff -u SPECS/cacti-plugin-boost.spec:1.3 SPECS/cacti-plugin-boost.spec:1.4

--- SPECS/cacti-plugin-boost.spec:1.3	Sun Jan  6 19:50:23 2008
+++ SPECS/cacti-plugin-boost.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	boost	
+%define		plugin boost
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - Boost
 Summary(pl.UTF-8):	Wtyczka do Cacti - Boost
@@ -8,7 +8,7 @@
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://mirror.cactiusers.org/downloads/plugins/%{namesrc}-%{version}.zip
+Source0:	http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
 # Source0-md5:	49c5989cc421781fb8e983d70ba2bcac
 URL:		http://www.cactiusers.org/
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 Cacti plugin that boosts Cacti performance especially for large sites.
@@ -30,16 +31,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README 
-%{webcactipluginroot}
+%doc LICENSE README
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -47,6 +48,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.3  2008/01/06 18:50:23  qboosh
 - pl
 

================================================================
Index: SPECS/cacti-plugin-configmanager.spec
diff -u SPECS/cacti-plugin-configmanager.spec:1.8 SPECS/cacti-plugin-configmanager.spec:1.9
--- SPECS/cacti-plugin-configmanager.spec:1.8	Thu Sep 18 18:49:08 2008
+++ SPECS/cacti-plugin-configmanager.spec	Sun Oct  5 13:18:07 2008
@@ -1,15 +1,17 @@
 # $Revision$, $Date$
-%define		namesrc	configmanager
+# TODO
+# - source1 not used?!
+%define		plugin configmanager
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - download/upload routers and switches configuration
 Summary(pl.UTF-8):	Wtyczka do Cacti - Å›ciÄ…ganie/wysyÅ‚anie konfiguracji routerÃ³w/switchy
-Name:		cacti-plugin-configmanager
+Name:		cacti-plugin-%{plugin}
 Version:	0.76
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
 # http://forums.cacti.net/download.php?id=6449
-Source0:	%{namesrc}%{version}.zip
+Source0:	%{plugin}%{version}.zip
 # Source0-md5:	d3cdb035a4d47ff464916774dd953457
 # http://forums.cacti.net/download.php?id=10980
 Source1:	sharednetworkclass0.40.zip
@@ -20,7 +22,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 With Cacti configmanager plugin you can easily schedule the
@@ -47,25 +50,24 @@
 - "multi", potrafiÄ…ca uÅ¼ywaÄ‡ dowolne skrypty lub SCP, FTP, SFTP
 
 %prep
-%setup -q -c -a1
+%setup -qc -a1
 
 # undos the source
 find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
 
-cd %{namesrc}%{version}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+cp -a %{plugin}%{version}/* $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{namesrc}%{version}/{Manual.txt,template.txt,configmanager_trap_list.txt}
-%{webcactipluginroot}
+%doc %{plugin}%{version}/{Manual.txt,template.txt,configmanager_trap_list.txt}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -73,11 +75,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.8  2008/09/18 16:49:08  gotar
 - uploaded sources to dropin
 
 Revision 1.7  2008/09/18 16:44:51  gotar
-- links to sources from Pawe³ 'duddits' D³ugosz
+- links to sources from PaweÅ‚ 'duddits' DÅ‚ugosz
 
 Revision 1.6  2008/09/18 13:45:43  grzegorz
 - up to 0.76

================================================================
Index: SPECS/cacti-plugin-devices.spec
diff -u SPECS/cacti-plugin-devices.spec:1.6 SPECS/cacti-plugin-devices.spec:1.7
--- SPECS/cacti-plugin-devices.spec:1.6	Wed Dec 26 14:06:27 2007
+++ SPECS/cacti-plugin-devices.spec	Sun Oct  5 13:18:07 2008
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
-%define		namesrc	devices
+%define		plugin devices
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - Devices
 Summary(pl.UTF-8):	Wtyczka do Cacti - Devices
-Name:		cacti-plugin-devices
+Name:		cacti-plugin-%{plugin}
 Version:	0.4
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://wotsit.thingy.com/haj/cacti/%{namesrc}-%{version}.zip
+Source0:	http://wotsit.thingy.com/haj/cacti/%{plugin}-%{version}.zip
 # Source0-md5:	c2464ec843cc6d3d464ca179cb4b053a
 URL:		http://wotsit.thingy.com/haj/cacti/devices-plugin.html
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 This is a simple plugin for the Cacti Plugin Architecture for Cacti
@@ -32,24 +33,24 @@
 Ma byÄ‡ zakÅ‚adkÄ… pokazujÄ…cÄ… aktualnÄ… dostÄ™pnoÅ›Ä‡ urzÄ…dzeÅ„, ale bez
 moÅ¼liwoÅ›ci edycji urzÄ…dzeÅ„. Jest to zmodyfikowana kopia strony
 'hosts.php' tworzÄ…cej stronÄ™ Devices wewnÄ…trz konsoli. CaÅ‚y kod do
-modyfikacji ustawieÅ„ zostaÅ‚ usuniÄ™ty, a urzÄ…dzenie przechodzi do
-trybu podglÄ…du wykresu (Graph Preview) z ustawionym tym urzÄ…dzeniem
-jako filtrem (wiÄ™c widaÄ‡ tylko wykres dla tego urzÄ…dzenia).
+modyfikacji ustawieÅ„ zostaÅ‚ usuniÄ™ty, a urzÄ…dzenie przechodzi do trybu
+podglÄ…du wykresu (Graph Preview) z ustawionym tym urzÄ…dzeniem jako
+filtrem (wiÄ™c widaÄ‡ tylko wykres dla tego urzÄ…dzenia).
 
 %prep
-%setup -q -n %{namesrc}
+%setup -q -n %{plugin}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{webcactipluginroot}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -57,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.6  2007/12/26 13:06:27  glen
 - cleanups
 

================================================================
Index: SPECS/cacti-plugin-discovery.spec
diff -u SPECS/cacti-plugin-discovery.spec:1.13 SPECS/cacti-plugin-discovery.spec:1.14
--- SPECS/cacti-plugin-discovery.spec:1.13	Thu Sep 18 15:41:49 2008
+++ SPECS/cacti-plugin-discovery.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	discovery
+%define		plugin discovery
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - Discovery
 Summary(pl.UTF-8):	Wtyczka do Cacti - Discovery
@@ -8,7 +8,7 @@
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://mirror.cactiusers.org/downloads/plugins/%{namesrc}-%{version}.zip
+Source0:	http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
 # Source0-md5:	abefb45b806d0bc0074b6d9516a940a4
 URL:		http://www.cactiusers.org/
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 Plugin for Cacti - This plugin adds the ability to auto-discover
@@ -33,8 +34,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,7 +43,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%{webcactipluginroot}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -50,6 +51,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.13  2008/09/18 13:41:49  grzegorz
 - up to 0.8.4
 

================================================================
Index: SPECS/cacti-plugin-flowview.spec
diff -u SPECS/cacti-plugin-flowview.spec:1.8 SPECS/cacti-plugin-flowview.spec:1.9
--- SPECS/cacti-plugin-flowview.spec:1.8	Fri Sep 19 09:56:08 2008
+++ SPECS/cacti-plugin-flowview.spec	Sun Oct  5 13:18:07 2008
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
-%define		namesrc	 flowview
+%define		plugin flowview
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti -  Flowview
 Summary(pl.UTF-8):	Wtyczka do Cacti -  Flowview
-Name:		cacti-plugin-flowview
+Name:		cacti-plugin-%{plugin}
 Version:	0.5.2
 Release:	1
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://mirror.cactiusers.org/downloads/plugins/%{namesrc}-%{version}.zip
+Source0:	http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
 # Source0-md5:	d5c22b7e46b192a39b993a0d9ba96628
 URL:		http://www.cactiusers.org/
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 Plugin for Cacti - This plugin allows you to see reports based off the
@@ -31,8 +32,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,7 +41,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%{webcactipluginroot}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -48,6 +49,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.8  2008/09/19 07:56:08  grzegorz
 - up by Pawel Dlugosz
 

================================================================
Index: SPECS/cacti-plugin-hostinfo.spec
diff -u SPECS/cacti-plugin-hostinfo.spec:1.7 SPECS/cacti-plugin-hostinfo.spec:1.8
--- SPECS/cacti-plugin-hostinfo.spec:1.7	Wed Dec 26 14:06:27 2007
+++ SPECS/cacti-plugin-hostinfo.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	 hostinfo
+%define		plugin hostinfo
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti -  Host info
 Summary(pl.UTF-8):	Wtyczka do Cacti -  Host info
@@ -8,7 +8,7 @@
 Release:	1
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://mirror.cactiusers.org/downloads/plugins/%{namesrc}-%{version}.zip
+Source0:	http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
 # Source0-md5:	e06cda8197ed5677d918737321528394
 URL:		http://www.cactiusers.org/
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 Plugin for Cacti - This plugin will give you version information about
@@ -37,15 +38,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{webcactipluginroot}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -53,6 +54,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.7  2007/12/26 13:06:27  glen
 - cleanups
 

================================================================
Index: SPECS/cacti-plugin-links.spec
diff -u SPECS/cacti-plugin-links.spec:1.7 SPECS/cacti-plugin-links.spec:1.8
--- SPECS/cacti-plugin-links.spec:1.7	Wed Dec 26 14:06:27 2007
+++ SPECS/cacti-plugin-links.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	links
+%define		plugin links
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - Links
 Summary(pl.UTF-8):	Wtyczka do Cacti - Links
@@ -9,7 +9,7 @@
 License:	GPL v2
 Group:		Applications/WWW
 #!!!!problem with version
-Source0:	http://wotsit.thingy.com/haj/cacti/%{namesrc}-%{version}.zip
+Source0:	http://wotsit.thingy.com/haj/cacti/%{plugin}-%{version}.zip
 # Source0-md5:	cf90133193311a3e3d63d11d3528e7ba
 Patch0:		%{name}-config.patch
 URL:		http://wotsit.thingy.com/haj/cacti/links-plugin.html
@@ -18,8 +18,9 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
-%define		webcactipluginconf %{_sysconfdir}/cacti
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
+%define		_sysconfdir		/etc/cacti
 
 %description
 This is a very simple plugin for the Cacti Plugin Architecture created
@@ -39,22 +40,22 @@
 odnoÅ›nikÃ³w do Smokepinga, Request Trackera lub Nagiosa...
 
 %prep
-%setup -q -n %{namesrc}
+%setup -q -n %{plugin}
 %patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{webcactipluginroot},%{webcactipluginconf}}
-install editme.php $RPM_BUILD_ROOT%{webcactipluginconf}/plugin-links.php
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT{%{plugindir},%{_sysconfdir}}
+cp -a editme.php $RPM_BUILD_ROOT%{_sysconfdir}/plugin-links.php
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{webcactipluginconf}/plugin-links.php
-%{webcactipluginroot}
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-links.php
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.7  2007/12/26 13:06:27  glen
 - cleanups
 

================================================================
Index: SPECS/cacti-plugin-mactrack.spec
diff -u SPECS/cacti-plugin-mactrack.spec:1.7 SPECS/cacti-plugin-mactrack.spec:1.8
--- SPECS/cacti-plugin-mactrack.spec:1.7	Wed Dec 26 14:06:27 2007
+++ SPECS/cacti-plugin-mactrack.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	mactrack	
+%define		plugin mactrack
 %include	/usr/lib/rpm/macros.perl
 Summary:	MacTrack - Cacti plugin to track device MAC/IP addresses and ports
 Summary(pl.UTF-8):	MacTrack - wtyczka Cacti do Å›ledzenia adresÃ³w MAC/IP i portÃ³w urzÄ…dzeÅ„
@@ -8,7 +8,7 @@
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://mirror.cactiusers.org/downloads/plugins/%{namesrc}-%{version}.zip
+Source0:	http://mirror.cactiusers.org/downloads/plugins/%{plugin}-%{version}.zip
 # Source0-md5:	635bb1df81bf9c0f28368438c4dcba42
 URL:		http://cactiusers.org/wiki/MacTrackDocs
 BuildRequires:	rpm-perlprov
@@ -16,7 +16,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		cactidir		/usr/share/cacti
+%define		plugindir		%{cactidir}/plugins/%{plugin}
 
 %description
 MacTrack - Cacti plugin to track device MAC/IP addresses and ports.
@@ -30,16 +31,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{webcactipluginroot}/docs/*
-%{webcactipluginroot}
+%doc %{plugindir}/docs/*
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -47,6 +48,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.7  2007/12/26 13:06:27  glen
 - cleanups
 

================================================================
Index: SPECS/cacti-plugin-manage.spec
diff -u SPECS/cacti-plugin-manage.spec:1.4 SPECS/cacti-plugin-manage.spec:1.5
--- SPECS/cacti-plugin-manage.spec:1.4	Fri Sep 19 09:56:08 2008
+++ SPECS/cacti-plugin-manage.spec	Sun Oct  5 13:18:07 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		namesrc	manage
+%define		plugin	manage
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - dashboard for Network Services
 Summary(pl.UTF-8):	Wtyczka do Cacti - panel z usÅ‚ugami sieciowymi
@@ -8,7 +8,7 @@
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://gilles.boulon.free.fr/manage/%{namesrc}-%{version}.zip
+Source0:	http://gilles.boulon.free.fr/manage/%{plugin}-%{version}.zip
 # Source0-md5:	84f4b39e82620bcafa514fb59f67f223
 URL:		http://forums.cacti.net/about13827.html
 BuildRequires:	rpm-perlprov
@@ -17,7 +17,7 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
+%define		plugindir /usr/share/cacti/plugins/%{plugin}
 
 %description
 This Cacti plugin allows you to automatically view your network by
@@ -85,15 +85,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{webcactipluginroot}
+%{plugindir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -101,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008/10/05 11:18:07  glen
+- simplify macros and cleanups
+
 Revision 1.4  2008/09/19 07:56:08  grzegorz
 - up by Pawel Dlugosz
 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-boost.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-configmanager.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-devices.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-discovery.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-flowview.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-hostinfo.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-links.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-mactrack.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-manage.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-monitor.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-npc.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-ntop.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-passwd.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-pollperf.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-reports.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-rrdclean.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-settings.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-ssl.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-superlinks.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-syslog.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-thold.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-tools.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-update.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-plugin-weathermap.spec?r1=1.6&r2=1.7&f=u

