- simplify macros and cleanups

Changed files:
    cacti-plugin-tools.spec -> 1.10

diff --git a/cacti-plugin-tools.spec b/cacti-plugin-tools.spec
index 6832ac1fbb69e58dd2a6de7d832e5d4ef5d16520..8ec74bcb485d56e1774bbb1bb27cd3264c1006ab 100644 (file)
--- a/cacti-plugin-tools.spec
+++ b/cacti-plugin-tools.spec
@@ -1,4 +1,4 @@
-%define                namesrc tools
+%define                plugin  tools
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - Tools
 Summary(pl.UTF-8):     Wtyczka do Cacti - Tools
@@ -7,7 +7,7 @@ Version:        0.3
 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: b09190195d81852d208fb01a8a9f65c9
 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 - Tools.
@@ -28,8 +29,8 @@ Wtyczka do Cacti - Tools.
 
 %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
@@ -37,4 +38,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%{webcactipluginroot}
+%{plugindir}