SPECS: nagios-plugins.spec - created -libs with libraries for exte...

[glen]

Author: glen                         Date: Wed Oct 24 21:41:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- created -libs with libraries for external plugins
- fix amd64 install

---- Files affected:
SPECS:
   nagios-plugins.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.70 SPECS/nagios-plugins.spec:1.71
--- SPECS/nagios-plugins.spec:1.70	Wed Sep 19 17:48:46 2007
+++ SPECS/nagios-plugins.spec	Wed Oct 24 23:41:54 2007
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	1.4.9
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
@@ -68,16 +68,22 @@
 
 Ten pakiet zawiera podstawowe wtyczki do używania z pakietem nagios.
 
-# NOTE for sub package requires:
-# use Requires:	%{name} = %{version}-%{release} for utils.sh or utils.pm
-# and Requires:	nagios-core if just plugins directory needed
+%package libs
+Summary:	Nagios plugins base libraries
+Group:		Networking
+
+%description libs
+This package contains nagios plugins base libraries that plugins depend on.
 
+# NOTE for sub package requires:
+# Requires:	nagios-core for plugins directory
+# and add Requires:	%{name}-libs = %{version}-%{release} for utils.{sh,pm,php}
 %package snmp
 Summary:	Nagios plugins using SNMP protocol to query information
 Summary(pl.UTF-8):	Wtyczki Nagiosa używające protokołu SNMP w celu uzyskania informacji
 Group:		Networking
 # for utils.pm
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	net-snmp-utils
 Requires:	perl-Net-SNMP
 
@@ -92,7 +98,7 @@
 Summary(pl.UTF-8):	Wtyczka Nagiosa do zdalnego sprawdzania dysku z użyciem smbclienta
 Group:		Networking
 # for utils.pm
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	samba-client
 
 %description samba
@@ -106,7 +112,7 @@
 Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania stanu sprzętu przy użyciu pakietu lm_sensors
 Group:		Networking
 # for utils.sh
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	lm_sensors
 Provides:	nagios-plugins-sensors = %{version}-%{release}
 Obsoletes:	nagios-plugins-sensors
@@ -222,7 +228,7 @@
 Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania czasu przy użyciu protokołu NTP
 Group:		Networking
 # for utils.pm
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	ntp-client
 Provides:	nagios-plugins-ntp = %{version}-%{release}
 Obsoletes:	nagios-plugins-ntp
@@ -339,7 +345,7 @@
 Summary(pl.UTF-8):	Wtyczki Nagiosa napisane w Perlu
 Group:		Networking
 # for utils.pm
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 # for perl(Exporter)
 Requires:	perl-base
 
@@ -354,7 +360,7 @@
 #Summary:	Nagios plugin to check NT server with NSClient
 #Summary(pl):	Wtyczka Nagiosa do sprawdzania serwera NT przy użyciu NSClienta
 #Group:		Networking
-#Requires:	%{name} = %{version}-%{release}
+#Requires:	%{name}-libs = %{version}-%{release}
 #Requires:	nsclient
 #
 #%description nsclient
@@ -368,7 +374,7 @@
 #Summary:	Nagios plugin nwstat
 #Summary(pl):	Wtyczka nwstat do Nagiosa
 #Group:		Networking
-#Requires:	%{name} = %{version}-%{release}
+#Requires:	%{name}-libs = %{version}-%{release}
 #Requires:	mrtgext
 #
 #%description nsclient
@@ -384,7 +390,7 @@
 Summary(pl.UTF-8):	Wtyczki przekazane do projektu Nagios
 Group:		Networking
 # for utils.pm, utils.sh
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 # check_apache
 Requires:	perl-URI
 Requires:	perl-libwww
@@ -514,8 +520,6 @@
 %{__make} install-root -C plugins-root \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php
-
 %find_lang %{name}
 
 cd contrib
@@ -527,6 +531,8 @@
 mv $(find $RPM_BUILD_ROOT%{_pluginarchdir} -type f | xargs file | awk -F: '!/ELF/{print $1}') $RPM_BUILD_ROOT%{_pluginlibdir}
 %endif
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -547,13 +553,6 @@
 %doc FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS
 
 %defattr(755,root,root,755)
-# utils
-%{_pluginarchdir}/negate
-%{_pluginarchdir}/urlize
-%{_pluginlibdir}/utils.pm
-%{_pluginlibdir}/utils.php
-%{_pluginlibdir}/utils.sh
-
 # plugins
 %{_pluginarchdir}/check_apt
 %{_pluginarchdir}/check_cluster
@@ -599,6 +598,14 @@
 # probably needs some external programs. can't test
 %{_pluginlibdir}/check_oracle
 
+%files libs
+%defattr(755,root,root,755)
+%{_pluginarchdir}/negate
+%{_pluginarchdir}/urlize
+%{_pluginlibdir}/utils.pm
+%{_pluginlibdir}/utils.php
+%{_pluginlibdir}/utils.sh
+
 %files perl
 %defattr(755,root,root,755)
 %{_pluginlibdir}/check_file_age
@@ -754,6 +761,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2007/10/24 21:41:54  glen
+- created -libs with libraries for external plugins
+- fix amd64 install
+
 Revision 1.70  2007/09/19 15:48:46  glen
 - install utils.php
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nagios-plugins.spec?r1=1.70&r2=1.71&f=u