X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cacti-plugin-npc.spec;h=a78d203fd7595ba7103ff5b131f97e1a0534a9ef;hb=b297b5045da18e40f87684701ee20dd0e09a75d6;hp=f196c07e362168937bf749146dd28401b214e69c;hpb=3fc805a28392fa5138961308b5d5118b430bbe6a;p=packages%2Fcacti-plugin-npc.git

diff --git a/cacti-plugin-npc.spec b/cacti-plugin-npc.spec
index f196c07..a78d203 100644
--- a/cacti-plugin-npc.spec
+++ b/cacti-plugin-npc.spec
@@ -1,6 +1,6 @@
 # TODO
-# -  Edit the MySQL options on line 143 of /cacti/plugins/npc/neb/inserter.c
-%define		namesrc	npc
+# - Edit the MySQL options on line 143 of /cacti/plugins/npc/neb/inserter.c
+%define		plugin	npc
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugin for Cacti - NPC
 Summary(pl.UTF-8):	Wtyczka do Cacti - NPC
@@ -9,23 +9,26 @@ 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
-#Patch1:		http://forums.cacti.net/files/neb_159.patch
+#Patch1: http://forums.cacti.net/files/neb_159.patch
 # from http://forums.cacti.net/about10327-0-asc-135.html
 Patch1:		%{name}-extinfo.patch
-URL:		http://forums.cacti.net/about10327
-BuildRequires:	rpm-perlprov
-BuildRequires:	nagios-devel >= 2.1
+URL:		http://forums.cacti.net/about10327.html
+BuildRequires:	glib2-devel
 BuildRequires:	mysql-devel >= 4.1.0
+BuildRequires:	nagios-devel >= 2.1
+BuildRequires:	pkgconfig
+BuildRequires:	rpm-perlprov
 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.
@@ -35,27 +38,26 @@ 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
 
 %build
-cd ./neb
-%{__make}
+cd neb
+%{__cc} %{rpmcflags} -Wall -o inserter.o inserter.c -shared -I../include $(pkg-config glib-2.0 --cflags) $(mysql_config --cflags --libs) -fPIC
 
 %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}
-rm -fr ./neb
-cp -aRf * $RPM_BUILD_ROOT%{webcactipluginroot}
+install -d $RPM_BUILD_ROOT{%{plugindir},%{moduledir}}
+install neb/inserter.o $RPM_BUILD_ROOT%{moduledir}
+cp -a . $RPM_BUILD_ROOT%{plugindir}
+rm -rf $RPM_BUILD_ROOT%{plugindir}/neb
 
 # 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
@@ -67,6 +69,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc TODO README 
-%{webcactipluginroot}
-%{pathtonagiosmodules}/inserter.o
+%doc TODO README
+%{plugindir}
+%attr(755,root,root) %{moduledir}/inserter.o