[Sblim-commit] sfcb Makefile.am,1.5,1.6 configure.ac,1.3,1.4 sfcb.init-none,1.1,1.2 sfcb.init-redhat,1.2,1.3 sfcb.init-suse,1.2,1.3 sfcb.spec.in,1.4,1.5 sfcbrepos.sh.in,1.2,1.3 sfcbstage.sh.in,1.2,1.3

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13740

Modified Files:
	Makefile.am configure.ac sfcb.init-none sfcb.init-redhat 
	sfcb.init-suse sfcb.spec.in sfcbrepos.sh.in sfcbstage.sh.in 
Log Message:
BUG 1169073 Fixed.
Fixed sfcbstage and sfcbrepos scripts.
Added CMPI library to init scripts' LD_LIBRARY_PATH.
Enhanced RPM Spec file.


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/sfcb/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	11 Mar 2005 12:22:35 -0000	1.3
+++ configure.ac	24 Mar 2005 12:44:45 -0000	1.4
@@ -21,7 +21,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 0.8.6c, sc...@de..., sfcb)
+AC_INIT(Small Footprint CIM Broker, 0.8.6d, sc...@de..., sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 AM_INIT_AUTOMAKE

Index: sfcbstage.sh.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcbstage.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sfcbstage.sh.in	10 Mar 2005 15:40:46 -0000	1.2
+++ sfcbstage.sh.in	24 Mar 2005 12:44:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 function usage() 
 {
-    echo "usage: $0 [-h] [ -s stagingdir] [ -r regfile ] mof ...  " 1>&2 
+    echo "usage: $0 [-h] [ -s stagingdir] [ -r regfile ] [ mof ... ]  " 1>&2 
 }
 
 
@@ -42,7 +42,7 @@
     exit 0
 fi
 
-if [ -z "$*" ]
+if [ -z "$*" ] && [ -z "$regfile" ]
 then
     usage $0
     exit 1
@@ -55,18 +55,20 @@
 
 if [ -n "$regfile" ]
 then
-    cp $regfile $stagingdir/regs ||
-    (echo "Error: could not copy registration files to $stagingdir" 1>&2 &&
-    exit 1)
+    test -d $stagingdir/regs || mkdir $stagingdir/regs
+    if ! cp $regfile $stagingdir/regs
+    then
+	echo "Error: could not copy registration files " 1>&2
+	exit 1
+    fi
 fi
 
 if [ -n "$*" ]
 then
-    (cp $* $stagingdir/mofs && exit 0) ||
-    echo "Error: could not find registration files" 1>&2    
-    exit 1
+    test -d $stagingdir/mofs || mkdir $stagingdir/mofs
+    if ! cp $* $stagingdir/mofs
+    then
+	echo "Error: could not copy schema files " 1>&2    
+	exit 1
+    fi
 fi
-
-
-
-

Index: sfcb.init-none
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.init-none,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sfcb.init-none	10 Mar 2005 15:40:46 -0000	1.1
+++ sfcb.init-none	24 Mar 2005 12:44:45 -0000	1.2
@@ -1,6 +1,6 @@
-# $Id$
-#
 #!/bin/bash
+#
+# $Id$
 # 
 # Generic System V Init Script
 
@@ -9,6 +9,14 @@
 if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@
 then
     LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
+fi
+
+# Add CMPI directory
+if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@/cmpi
+then
+    LD_LIBRARY_PATH=@libdir@/cmpi:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
 fi
 
 start() {

Index: sfcb.spec.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sfcb.spec.in	11 Mar 2005 13:29:56 -0000	1.4
+++ sfcb.spec.in	24 Mar 2005 12:44:45 -0000	1.5
@@ -1,7 +1,7 @@
 #
-# sfcb.spec
+# $Id$
 #
-# Package spec for wbemcli
+# Package spec for @PACKAGE@
 #
 
 BuildRoot: /var/tmp/buildroot
@@ -15,6 +15,8 @@
 
 Source0: ftp://www-126.ibm.com/pub/sblim/%{name}-%{version}.tar.bz2
 
+Provides: cimserver
+
 %Description
 Small Footprint CIM Broker.
 

Index: sfcb.init-suse
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.init-suse,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sfcb.init-suse	11 Mar 2005 10:05:36 -0000	1.2
+++ sfcb.init-suse	24 Mar 2005 12:44:45 -0000	1.3
@@ -18,6 +18,14 @@
 if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@
 then
     LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
+fi
+
+# Add CMPI directory
+if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@/cmpi
+then
+    LD_LIBRARY_PATH=@libdir@/cmpi:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
 fi
 
 start() {

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	12 Mar 2005 00:42:57 -0000	1.5
+++ Makefile.am	24 Mar 2005 12:44:45 -0000	1.6
@@ -146,7 +146,7 @@
 	cimXmlParser.h    native.h       support.h cimXmlGen.h \
 	cimXmlRequest.h  genericlist.h  objectImpl.h   trace.h \
 	hashtable.h      utilft.h \
-	cmpidt.h cmpift.h cmpimacs.h  cmpios.h fileRepository.h \
+	cmpidt.h cmpift.h cmpiftx.h cmpimacs.h  cmpios.h fileRepository.h \
 	selectexp.h queryOperation.h authorizationUtil.h authorizationEnum.c \
 	sfcVersion.h
 

Index: sfcbrepos.sh.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcbrepos.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sfcbrepos.sh.in	10 Mar 2005 15:40:46 -0000	1.2
+++ sfcbrepos.sh.in	24 Mar 2005 12:44:45 -0000	1.3
@@ -81,13 +81,17 @@
 if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&
 	[ -f $cimschemadir/CIM_Schema.mof ] 
 then
-    (rm -rf $registrationdir/repository &&
+    if rm -rf $registrationdir/repository &&
 	mkdir -p $registrationdir/repository/root/cimv2 &&
 	cp $stagingdir/default.reg $registrationdir/providerRegister &&
 	cat $stagingdir/regs/*.reg >> $registrationdir/providerRegister &&
-	mofc -o $registrationdir/repository/root/cimv2/classSchemas -I $cimschemadir -i CIM_Schema.mof $stagingdir/mofs/*.mof &&
-	exit 0) ||
-    (echo Failed to create sfcb registration. >&2 && exit 1)
+	mofc -o $registrationdir/repository/root/cimv2/classSchemas -I $cimschemadir -i CIM_Schema.mof $stagingdir/mofs/*.mof 
+	then 	
+	exit 0
+    else	
+	echo Failed to create sfcb registration. >&2 
+	exit 1
+    fi
 else
     echo Could not find required staging files. Please check your setup. >&2
     exit 1

Index: sfcb.init-redhat
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.init-redhat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sfcb.init-redhat	11 Mar 2005 10:05:36 -0000	1.2
+++ sfcb.init-redhat	24 Mar 2005 12:44:45 -0000	1.3
@@ -18,6 +18,14 @@
 if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@
 then
     LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
+fi
+
+# Add CMPI directory
+if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@/cmpi
+then
+    LD_LIBRARY_PATH=@libdir@/cmpi:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
 fi
 
 start() {