From a77a0d2fcc7015ad1077b31744c4c43c9b6fbfc0 Mon Sep 17 00:00:00 2001 From: zbyniu Date: Mon, 2 Apr 2007 18:10:49 +0000 Subject: [PATCH] - up to 2.00.00 Changed files: ccs-optflags.patch -> 1.2 ccs.spec -> 1.21 --- ccs-optflags.patch | 41 +++++++++++++++++++++-------------------- ccs.spec | 8 +++----- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ccs-optflags.patch b/ccs-optflags.patch index 7bda7eb..de02980 100644 --- a/ccs-optflags.patch +++ b/ccs-optflags.patch @@ -31,8 +31,8 @@ diff -Nur cluster-1.02.00.orig/ccs/ccs_test/Makefile cluster-1.02.00.optflags/cc diff -Nur cluster-1.02.00.orig/ccs/ccs_tool/Makefile cluster-1.02.00.optflags/ccs/ccs_tool/Makefile --- cluster-1.02.00.orig/ccs/ccs_tool/Makefile 2005-05-12 17:17:39.000000000 +0200 +++ cluster-1.02.00.optflags/ccs/ccs_tool/Makefile 2006-08-04 02:48:38.000000000 +0200 -@@ -17,20 +17,20 @@ - INCLUDE= -I. -I${top_srcdir}/config -I${top_srcdir}/include -I${ccs_libdir} -I${incdir} +@@ -18,21 +18,21 @@ + -I../../cman/lib ifeq ($(DEBUG),y) -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \ @@ -46,21 +46,23 @@ diff -Nur cluster-1.02.00.orig/ccs/ccs_tool/Makefile cluster-1.02.00.optflags/cc -LDFLAGS+= -L${ccs_libdir} `xml2-config --libs` -L${libdir} +LOADLIBES+= -L${ccs_libdir} `xml2-config --libs` -L${libdir} - LOADLIBES+= -lccs -lmagma -lmagmamsg -ldl + LOADLIBES+= -lccs -ldl all: ccs_tool ccs_tool: ccs_tool.c update.c upgrade.c old_parser.c editconf.c -- ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} ${LOADLIBES} -+ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LOADLIBES} +- ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} ${LOADLIBES} \ +- ../../cman/lib/libcman.a ++ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LOADLIBES} \ ++ -lcman clean: rm -f *.o ccs_tool *~ diff -Nur cluster-1.02.00.orig/ccs/daemon/Makefile cluster-1.02.00.optflags/ccs/daemon/Makefile --- cluster-1.02.00.orig/ccs/daemon/Makefile 2004-10-19 01:00:39.000000000 +0200 +++ cluster-1.02.00.optflags/ccs/daemon/Makefile 2006-08-04 02:43:07.000000000 +0200 -@@ -18,14 +18,14 @@ - INCLUDE= -I. -I../include -I../common -I${top_srcdir}/config -I${incdir} +@@ -19,20 +19,20 @@ + INCLUDE= -I. -I../include -I../common -I${top_srcdir}/config -I../../cman/lib ifeq ($(DEBUG),y) -CFLAGS+= -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DDEBUG -g \ @@ -72,19 +74,18 @@ diff -Nur cluster-1.02.00.orig/ccs/daemon/Makefile cluster-1.02.00.optflags/ccs/ `xml2-config --cflags` -DCCS_RELEASE_NAME=\"${RELEASE}\" endif --LDFLAGS+= -L${libdir} `xml2-config --libs` -lpthread -lmagma -lmagmamsg -ldl -+LIBS += -L${libdir} `xml2-config --libs` -lpthread -lmagma -lmagmamsg -ldl +-LDFLAGS+= -L${libdir} `xml2-config --libs` -lpthread -ldl ++LIBS += -L${libdir} `xml2-config --libs` -lpthread -ldl - all: ccsd - -@@ -33,7 +33,7 @@ - cp ccsd ${top_srcdir}/bin + all: ${TARGET} ccsd: ccsd.c cnx_mgr.c cluster_mgr.c misc.c ../common/log.c globals.c -- ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} -+ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LIBS} +- ${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} \ +- ../../cman/lib/libcman.a ++ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDE} -o $@ $^ ${LIBS} \ ++ -lcman - install: ccsd + install: all install -d ${sbindir} diff -Nur cluster-1.02.00.orig/ccs/lib/Makefile cluster-1.02.00.optflags/ccs/lib/Makefile --- cluster-1.02.00.orig/ccs/lib/Makefile 2004-08-03 18:39:14.000000000 +0200 @@ -93,11 +94,11 @@ diff -Nur cluster-1.02.00.orig/ccs/lib/Makefile cluster-1.02.00.optflags/ccs/lib INCLUDE = -I../include -I../common ifeq ($(DEBUG),y) --CFLAGS+= -O2 -D_FILE_OFFSET_BITS=64 -DDEBUG -g -+CFLAGS+= $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 -DDEBUG -g +-CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g ++CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 -DDEBUG -g else --CFLAGS+= -O2 -D_FILE_OFFSET_BITS=64 -+CFLAGS+= $(OPTCFLAGS) -D_FILE_OFFSET_BITS=64 +-CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64 ++CFLAGS+= $(OPTCFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 endif all: libccs.a diff --git a/ccs.spec b/ccs.spec index 646f43b..72ced4e 100644 --- a/ccs.spec +++ b/ccs.spec @@ -1,18 +1,18 @@ Summary: Cluster configuration system to manage the cluster config file Summary(pl.UTF-8): System konfiguracji klastra do zarządzania jego plikiem konfiguracyjnym Name: ccs -Version: 1.03.00 +Version: 2.00.00 Release: 1 License: GPL v2 Group: Applications/System Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz -# Source0-md5: 8eea23df70d2007c4fb8c234cfea49cf +# Source0-md5: 2ef3f4ba9d3c87b50adfc9b406171085 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-optflags.patch URL: http://sources.redhat.com/cluster/ccs/ +BuildRequires: cman-devel >= 2 BuildRequires: libxml2-devel >= 2.0 -BuildRequires: magma-devel >= 0:1.01 BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: magma >= 0:1.01 @@ -71,8 +71,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cluster/cluster.xml install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} -rm $RPM_BUILD_ROOT/etc/init.d/ccsd - %clean rm -rf $RPM_BUILD_ROOT -- 2.44.0