From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 6 Feb 2006 12:09:19 +0000 (+0000)
Subject: Don't include interlogd in RPM
X-Git-Tag: glite-lb-proxy_R_1_2_4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=479017d20b06a89d993ed961f8bf00e3246721f1;p=jra1mw.git

Don't include interlogd in RPM
---

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index 5c21061..4cb0fe8 100644
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -140,9 +140,11 @@ install:
 	${INSTALL} -m 755 glite_lb_proxy ${PREFIX}/bin/glite-lb-proxy
 	${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-dbsetup-proxy.sql ${PREFIX}/etc
 	${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-proxy
-	if [ x${DOSTAGE} != xyes ]; then \
-		${INSTALL} -m 755 ${stagedir}/bin/glite-lb-interlogd ${PREFIX}/bin; \
-	fi
+
+# don't do it due to RPM conflict
+#	if [ x${DOSTAGE} != xyes ]; then \
+#		${INSTALL} -m 755 ${stagedir}/bin/glite-lb-interlogd ${PREFIX}/bin; \
+#	fi
 
 
 clean:
diff --git a/org.glite.lb.proxy/project/version.properties b/org.glite.lb.proxy/project/version.properties
index 3990c7d..79bc646 100644
--- a/org.glite.lb.proxy/project/version.properties
+++ b/org.glite.lb.proxy/project/version.properties
@@ -1,5 +1,4 @@
 #Fri Sep 02 14:18:53 CEST 2005
-# hmm, the fix is in lb.server, but we take its static lib
-module.version=1.2.3
+module.version=1.2.4
 module.build=2
 module.age=0