rpms/cman/devel cman-makefix.patch,1.3,1.4 cman.spec,1.60,1.61

[fedora-cvs-commits redhat com]

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11498

Modified Files:
	cman-makefix.patch cman.spec 
Log Message:
More ccslibdir fixes.

cman-makefix.patch:
 cman/daemon/Makefile      |    2 +-
 cman/qdisk/Makefile       |    2 +-
 fence/fence_node/Makefile |    2 +-
 fence/fence_tool/Makefile |    2 +-
 group/lib/Makefile        |    6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cman-makefix.patch	3 Aug 2006 23:14:16 -0000	1.3
+++ cman-makefix.patch	4 Aug 2006 13:45:18 -0000	1.4
@@ -1,5 +1,5 @@
 --- cman-2.0.5/group/lib/Makefile.makefix	2005-06-23 10:32:30.000000000 -0500
-+++ cman-2.0.5/group/lib/Makefile	2006-08-03 18:10:46.000000000 -0500
++++ cman-2.0.5/group/lib/Makefile	2006-08-04 08:42:36.000000000 -0500
 @@ -18,7 +18,7 @@ STATICLIB=$(LIBNAME).a
  top_srcdir=..
  UNINSTALL=${top_srcdir}/scripts/uninstall.pl
@@ -20,8 +20,8 @@
  
  uninstall:
  
---- cman-2.0.5/cman/daemon/Makefile.makefix	2006-08-03 18:12:33.000000000 -0500
-+++ cman-2.0.5/cman/daemon/Makefile	2006-08-03 18:12:58.000000000 -0500
+--- cman-2.0.5/cman/daemon/Makefile.makefix	2006-07-07 02:53:14.000000000 -0500
++++ cman-2.0.5/cman/daemon/Makefile	2006-08-04 08:42:36.000000000 -0500
 @@ -33,7 +33,7 @@ copytobin: all
  	cp ${TARGET} ${top_srcdir}/bin
  
@@ -31,3 +31,36 @@
  
  daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
    daemon.h logging.h commands.h barrier.h cmanccs.h
+--- cman-2.0.5/cman/qdisk/Makefile.makefix	2006-08-04 08:43:42.000000000 -0500
++++ cman-2.0.5/cman/qdisk/Makefile	2006-08-04 08:43:55.000000000 -0500
+@@ -32,7 +32,7 @@ install: ${TARGET}
+ 
+ qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
+ 	gettid.o proc.o ../lib/libcman.a
+-	gcc -o $@ $^ -lpthread -L../lib -L${ccslibdir} -lccs
++	gcc -o $@ $^ -lpthread -L../lib -L$(ccslibdir) -lccs
+ 
+ mkqdisk: disk.o crc32.o disk_util.o \
+ 	 proc.o mkqdisk.o
+--- cman-2.0.5/fence/fence_node/Makefile.makefix	2006-08-04 08:44:22.000000000 -0500
++++ cman-2.0.5/fence/fence_node/Makefile	2006-08-04 08:44:30.000000000 -0500
+@@ -25,7 +25,7 @@ endif
+ 
+ INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${incdir} -I${top_srcdir}/config -I${top_srcdir}/../cman/lib
+ 
+-LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib
++LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib
+ LOADLIBES+= -lccs -lcman
+ 
+ FENCE_NODE_SRC = \
+--- cman-2.0.5/fence/fence_tool/Makefile.makefix	2006-08-04 08:44:03.000000000 -0500
++++ cman-2.0.5/fence/fence_tool/Makefile	2006-08-04 08:44:15.000000000 -0500
+@@ -25,7 +25,7 @@ endif
+ 
+ INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${cmanincdir} -I${incdir} -I${top_srcdir}/config
+ 
+-LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib -lcman
++LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib -lcman
+ LOADLIBES+= -lccs -lcman
+ 
+ FENCE_TOOL_SRC = \


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cman.spec	3 Aug 2006 23:14:16 -0000	1.60
+++ cman.spec	4 Aug 2006 13:45:18 -0000	1.61
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.6
+Release: 0.fc6.7
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager