rpms/cman/devel cman-makefix.patch,1.2,1.3 cman.spec,1.59,1.60

[fedora-cvs-commits at redhat.com]

Author: cfeist

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

Modified Files:
	cman-makefix.patch cman.spec 
Log Message:
Fixed lib64 problem w/ make.

cman-makefix.patch:
 cman/daemon/Makefile |    2 +-
 group/lib/Makefile   |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cman-makefix.patch	3 Aug 2006 22:04:16 -0000	1.2
+++ cman-makefix.patch	3 Aug 2006 23:14:16 -0000	1.3
@@ -1,6 +1,6 @@
 --- 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 16:58:16.000000000 -0500
-@@ -18,7 +18,7 @@
++++ cman-2.0.5/group/lib/Makefile	2006-08-03 18:10:46.000000000 -0500
+@@ -18,7 +18,7 @@ STATICLIB=$(LIBNAME).a
  top_srcdir=..
  UNINSTALL=${top_srcdir}/scripts/uninstall.pl
  
@@ -9,7 +9,7 @@
  
  CFLAGS += -g -O -I. -fPIC -I../daemon
  
-@@ -34,6 +34,10 @@
+@@ -34,6 +34,10 @@ libgroup.o: libgroup.c
  copytobin: all
  
  install: all
@@ -20,3 +20,14 @@
  
  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
+@@ -33,7 +33,7 @@ copytobin: all
+ 	cp ${TARGET} ${top_srcdir}/bin
+ 
+ service_cman.lcrso: ${CMAN_OBJS}
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
++	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L$(ccslibdir) -lccs
+ 
+ daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
+   daemon.h logging.h commands.h barrier.h cmanccs.h


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