- simplify macros and cleanups

Changed files:
    cacti-plugin-superlinks.spec -> 1.6

diff --git a/cacti-plugin-superlinks.spec b/cacti-plugin-superlinks.spec
index 27e4ae8ee48f1b80e7bec5f7b2a570cf1a0ebe24..4b7e756f49b7f8202847ebc927cdb467b40607a2 100644 (file)
--- a/cacti-plugin-superlinks.spec
+++ b/cacti-plugin-superlinks.spec
@@ -1,4 +1,4 @@
-%define                namesrc superlinks
+%define                plugin  superlinks
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - SuperLinks
 Summary(pl.UTF-8):     Wtyczka do Cacti - SuperLinks (dodatkowe odnośniki)
@@ -7,7 +7,7 @@ Version:        0.72
 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: 02fb63902642b496d68824358fabeced
 URL:           http://wotsit.thingy.com/haj/cacti/superlinks-plugin.html
 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
 This is a plugin for the Cacti Plugin Architecture created by Jimmy
@@ -61,14 +62,14 @@ wcześniej; ma następujące rozszerzenia:
   jakiegokolwiek HTML-a.
 
 %prep
-%setup -q -n %{namesrc}
+%setup -q -n %{plugin}
 # 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}
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT%{plugindir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,4 +77,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%{webcactipluginroot}
+%{plugindir}