- simplify macros and cleanups

Changed files:
    cacti-plugin-npc.spec -> 1.15

diff --git a/cacti-plugin-npc.spec b/cacti-plugin-npc.spec
index b9eef5636cc0ef5e974574eafc26ffbede119a58..ba482a55a4d62c4d906fe0fd12f8dd7e38944389 100644 (file)
--- a/cacti-plugin-npc.spec
+++ b/cacti-plugin-npc.spec
@@ -1,7 +1,6 @@
 # TODO
 # - Edit the MySQL options on line 143 of /cacti/plugins/npc/neb/inserter.c
-# - not lib64 safe
-%define                namesrc npc
+%define                plugin  npc
 %include       /usr/lib/rpm/macros.perl
 Summary:       Plugin for Cacti - NPC
 Summary(pl.UTF-8):     Wtyczka do Cacti - NPC
@@ -10,7 +9,7 @@ Version:       0.1.1a
 Release:       0.2
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://forums.cacti.net/files/%{namesrc}-%{version}.tar.gz
+Source0:       http://forums.cacti.net/files/%{plugin}-%{version}.tar.gz
 # Source0-md5: 325f2e49070420346b55b7b4e2994d34
 Patch0:                %{name}-path_headers.patch
 # inserter.c patch for nagios 3.0b6 from http://forums.cacti.net/about10327-0-asc-150.html
@@ -25,8 +24,9 @@ Requires:     cacti >= 0.8.6h
 Requires:      nagios >= 2.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                webcactipluginroot /usr/share/cacti/plugins/%{namesrc}
-%define                pathtonagiosmodules     /usr/lib/nagios/modules
+%define                cactidir                /usr/share/cacti
+%define                plugindir               %{cactidir}/plugins/%{plugin}
+%define                moduledir               %{_libdir}/nagios/modules
 
 %description
 Plugin for Cacti - A UI replacement for Nagios integrated into Cacti.
@@ -36,7 +36,7 @@ Wtyczka do Cacti - zamiennik interfejsu użytkownika dla Nagiosa
 zintegrowany z Cacti.
 
 %prep
-%setup -q -n %{namesrc}
+%setup -q -n %{plugin}
 %patch0 -p1
 %patch1 -p1
 
@@ -46,17 +46,16 @@ cd neb
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{webcactipluginroot}
-install -d $RPM_BUILD_ROOT%{pathtonagiosmodules}
-install neb/inserter.o $RPM_BUILD_ROOT%{pathtonagiosmodules}
+install -d $RPM_BUILD_ROOT{%{plugindir},%{moduledir}}
+install neb/inserter.o $RPM_BUILD_ROOT%{moduledir}
 rm -rf neb
-cp -a * $RPM_BUILD_ROOT%{webcactipluginroot}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 # Edit nagios.cfg and set:
 #
 #        retain_state_information=0
 #        event_broker_options=-1
-#        broker_module=%{pathtonagiosmodules}/inserter.o
+#        broker_module=%{moduledir}/inserter.o
 
 # Setting retain_state_information=0 causes all hosts and services to
 # go to a pending state until rechecked by Nagios. Without this setting
@@ -69,5 +68,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc TODO README
-%{webcactipluginroot}
-%attr(755,root,root) %{pathtonagiosmodules}/inserter.o
+%{plugindir}
+%attr(755,root,root) %{moduledir}/inserter.o