- simplify macros and cleanups

Changed files:
    cacti-plugin-discovery.spec -> 1.14

diff --git a/cacti-plugin-discovery.spec b/cacti-plugin-discovery.spec
index 073d4fc3c9adfefd3ea5a5c9efc96a41b2a685a3..7d06b02ded4dd0d19f792da8c66409a60f2fb444 100644 (file)
--- a/cacti-plugin-discovery.spec
+++ b/cacti-plugin-discovery.spec
@@ -1,4 +1,4 @@
-%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
@@ -7,7 +7,7 @@ Version:        0.8.4
 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
@@ -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 - This plugin adds the ability to auto-discover
@@ -32,8 +33,8 @@ urządzenia mają włączone SNMP.
 
 %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}