- simplify macros and cleanups

Changed files:
    cacti-plugin-passwd.spec -> 1.3

diff --git a/cacti-plugin-passwd.spec b/cacti-plugin-passwd.spec
index 615e4afda6f528730886121140041d13c8b5b0d1..a009e6422f1f439f7ba0124ec2e3940782196bb4 100644 (file)
--- a/cacti-plugin-passwd.spec
+++ b/cacti-plugin-passwd.spec
@@ -1,4 +1,4 @@
-%define                namesrc passwd
+%define                plugin  passwd
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - passwd
 Summary(pl.UTF-8):     Wtyczka do Cacti - passwd
@@ -7,7 +7,7 @@ Version:        0.2
 Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://gilles.boulon.free.fr/passwd/%{namesrc}-0.1-modified-%{version}.zip
+Source0:       http://gilles.boulon.free.fr/passwd/%{plugin}-0.1-modified-%{version}.zip
 # Source0-md5: 8c94eefb399b3b904e6c0ba5994d752c
 URL:           http://forums.cacti.net/about14751.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
 Plugin for Cacti - user changing passwords.
@@ -24,20 +25,20 @@ Plugin for Cacti - user changing passwords.
 Wtyczka do Cacti - zmiana hasła przez użytkownika.
 
 %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
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README 
-%{webcactipluginroot}
+%doc LICENSE README
+%{plugindir}