- simplify macros and cleanups

Changed files:
    cacti-plugin-ntop.spec -> 1.7

diff --git a/cacti-plugin-ntop.spec b/cacti-plugin-ntop.spec
index 1491a2713558e83f9e321a16a69d9aef7ae9613d..e487db7200141c9e8c5291d7e215ebb914204595 100644 (file)
--- a/cacti-plugin-ntop.spec
+++ b/cacti-plugin-ntop.spec
@@ -1,4 +1,4 @@
-%define                namesrc ntop
+%define                plugin  ntop
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - Ntop
 Summary(pl.UTF-8):     Wtyczka do Cacti - Ntop
@@ -7,7 +7,7 @@ Version:        0.1
 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: 7e5b07df1db6fc8db73aa16da878e0de
 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 - Ntop.
@@ -28,8 +29,8 @@ Wtyczka do Cacti - Ntop.
 
 %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}