packages: nagios-plugins/nagios-plugins.spec - fix some contrib linking

[glen]

Author: glen                         Date: Tue Sep 14 15:21:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix some contrib linking

---- Files affected:
packages/nagios-plugins:
   nagios-plugins.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: packages/nagios-plugins/nagios-plugins.spec
diff -u packages/nagios-plugins/nagios-plugins.spec:1.139 packages/nagios-plugins/nagios-plugins.spec:1.140
--- packages/nagios-plugins/nagios-plugins.spec:1.139	Tue Sep 14 16:46:59 2010
+++ packages/nagios-plugins/nagios-plugins.spec	Tue Sep 14 17:21:28 2010
@@ -564,13 +564,18 @@
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+# force regen in build
+rm -f configure
+
 %build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal} -I m4 -I gl/m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+if [ ! -f configure ]; then
+	%{__gettextize}
+	%{__libtoolize}
+	%{__aclocal} -I m4 -I gl/m4
+	%{__autoconf}
+	%{__autoheader}
+	%{__automake}
+fi
 
 %configure \
 	--libexecdir=%{_pluginarchdir} \
@@ -612,12 +617,12 @@
 %{__cc} %{rpmcflags} check_cluster2.c -o check_cluster2
 
 %{__cc} %{rpmcflags} -I../plugins -I.. -I../gl -I../lib -c check_rbl.c
-%{__cc} %{rpmcflags} check_rbl.o -o check_rbl ../plugins/popen.o ../plugins/utils.o ../plugins/netutils.o ../lib/utils_base.o
+%{__cc} %{rpmcflags} check_rbl.o -o check_rbl ../plugins/popen.o ../plugins/utils.o ../plugins/netutils.o ../lib/utils_base.o ../gl/libgnu.a
 
 %{__cc} %{rpmcflags} check_timeout.c -o check_timeout
 
 %{__cc} %{rpmcflags} -I../plugins -I.. -I../gl -I../lib -c check_uptime.c
-%{__cc} %{rpmcflags} check_uptime.o -o check_uptime ../plugins/popen.o ../plugins/utils.o ../lib/utils_base.o
+%{__cc} %{rpmcflags} check_uptime.o -o check_uptime ../plugins/popen.o ../plugins/utils.o ../lib/utils_base.o ../gl/libgnu.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -957,6 +962,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2010/09/14 15:21:28  glen
+- fix some contrib linking
+
 Revision 1.139  2010/09/14 14:46:59  glen
 - up to 1.4.15, but some stuff does not link together
 
================================================================

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