SPECS: nagios.spec - create /usr/lib/nagios/{plugins, eventhandlers...

[glen]

Author: glen                         Date: Wed May 16 12:51:00 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- create /usr/lib/nagios/{plugins,eventhandlers} for lib64 archidectures to be able to create noarch plugin packages
- rel 2

---- Files affected:
SPECS:
   nagios.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.94 SPECS/nagios.spec:1.95
--- SPECS/nagios.spec:1.94	Fri Apr 27 00:03:16 2007
+++ SPECS/nagios.spec	Wed May 16 14:50:55 2007
@@ -8,7 +8,7 @@
 Summary(pt_BR.UTF-8):	Programa para monitoração de máquinas e serviços
 Name:		nagios
 Version:	2.9
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -202,10 +202,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_includedir}/%{name},%{_libdir}/%{name}/{eventhandlers,plugins}} \
-	$RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir}/rw,%{_sysconfdir}/{plugins,local},%{_examplesdir}/%{name}-%{version}} \
-	$RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_webapps}/%{_webapp}} \
+	$RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir}/rw} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{plugins,local} \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/{eventhandlers,plugins} \
+%if "%{_lib}" != "lib"
+	$RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{eventhandlers,plugins} \
+%endif
 
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
 install include/*.h	$RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} install-unstripped \
@@ -231,6 +236,7 @@
 echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
 
 # install event handlers
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a contrib/eventhandlers $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # Object data/cache files
@@ -440,6 +446,12 @@
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/eventhandlers
 
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/%{name}
+%dir %{_prefix}/lib/%{name}/plugins
+%dir %{_prefix}/lib/%{name}/eventhandlers
+%endif
+
 %files cgi
 %defattr(644,root,root,755)
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}
@@ -479,6 +491,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2007/05/16 12:50:55  glen
+- create /usr/lib/nagios/{plugins,eventhandlers} for lib64 archidectures to be able to create noarch plugin packages
+- rel 2
+
 Revision 1.94  2007/04/26 22:03:16  qboosh
 - CVE reference
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.94&r2=1.95&f=u