- simplify macros and cleanups

Changed files:
    cacti-plugin-monitor.spec -> 1.13

diff --git a/cacti-plugin-monitor.spec b/cacti-plugin-monitor.spec
index 28558d21849849d507a739a306fc7af7f2adb393..f70b6287293bace455329a32f3f219bc1e38ae54 100644 (file)
--- a/cacti-plugin-monitor.spec
+++ b/cacti-plugin-monitor.spec
@@ -1,4 +1,4 @@
-%define                namesrc monitor
+%define                plugin  monitor
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - Monitor
 Summary(pl.UTF-8):     Wtyczka do Cacti - Monitor
@@ -7,7 +7,7 @@ Version:        0.8.2
 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: c3ce79679e7ae2e6a1d91a294dade776
 URL:           http://www.cactiusers.org/
 BuildRequires: rpm-perlprov
@@ -15,7 +15,8 @@ Requires:     cacti
 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 - adds a tab to visually show you the Up/Down Status
@@ -32,8 +33,8 @@ dźwiękowo alarmuje kiedy host przestaje działać.
 
 %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
@@ -41,4 +42,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%{webcactipluginroot}
+%{plugindir}