[Sblim-commit] sfcb Makefile.am,1.12,1.13 sfcb.spec.in,1.7,1.8 sfcbrepos.sh.in,1.5,1.6

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

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

Modified Files:
	Makefile.am sfcb.spec.in sfcbrepos.sh.in 
Log Message:
Bug 1187619: use -f option of getSchema.sh in Makefile.am.
Bug 1186414: fixed RPM-related problems with package rename.


Index: sfcb.spec.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sfcb.spec.in	19 Apr 2005 13:21:11 -0000	1.7
+++ sfcb.spec.in	26 Apr 2005 17:17:39 -0000	1.8
@@ -60,10 +60,10 @@
 find $RPM_BUILD_ROOT/%{_datadir}/%{name} -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/%{name}/CIM >> _pkg_list
 sed s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
 mv -f _pkg_list_2 _pkg_list
-echo "%config %{_sysconfdir}/%{name}" >> _pkg_list
+echo "%config %{_sysconfdir}/sfcb" >> _pkg_list
 echo "%doc %{_datadir}/doc" >> _pkg_list
-echo "%{_sysconfdir}/init.d/%{name}" >> _pkg_list
-echo "%{_localstatedir}/lib/%{name}" >> _pkg_list
+echo "%{_sysconfdir}/init.d/sfcb" >> _pkg_list
+echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
 echo "%{_bindir}/*" >> _pkg_list
 echo "%{_libdir}/*.so*" >> _pkg_list
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	25 Apr 2005 23:21:01 -0000	1.12
+++ Makefile.am	26 Apr 2005 17:17:39 -0000	1.13
@@ -21,7 +21,7 @@
 # 
 
 sfcbstatedir=$(localstatedir)/lib/sfcb
-sfcbdocdir=$(datadir)/doc/sfcb-$(VERSION)
+sfcbdocdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
 initdir=$(sysconfdir)/init.d
 
 BUILT_SOURCES=queryParser.c queryLexer.c authorizationParser.c \
@@ -29,7 +29,7 @@
 
 AM_YFLAGS=-d
 
-AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sysconfdir)/sfcb\" \
+AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sysconfdir)/$(PACKAGE)\" \
 	-DSFCB_STATEDIR=\"$(sfcbstatedir)\"
 
 SUBDIRS=. $(MOFC_DIR)
@@ -221,7 +221,7 @@
 
 install-cimschema: getSchema.sh
 	test -d $(DESTDIR)$(pkgdatadir) || $(mkdir_p) $(DESTDIR)$(pkgdatadir)
-	sh getSchema.sh $(DESTDIR)$(pkgdatadir)
+	sh getSchema.sh -f $(DESTDIR)$(pkgdatadir)
 
 postinstall: install-cimschema
 	test -f $(DESTDIR)$(sfcbstatedir)/registration/providerRegister || $(INSTALL_DATA) $(DESTDIR)$(sfcbstatedir)/stage/default.reg $(DESTDIR)$(sfcbstatedir)/registration/providerRegister 

Index: sfcbrepos.sh.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcbrepos.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sfcbrepos.sh.in	20 Apr 2005 17:00:27 -0000	1.5
+++ sfcbrepos.sh.in	26 Apr 2005 17:17:39 -0000	1.6
@@ -42,7 +42,7 @@
     echo -e "\t-f force repository creation"
     echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
     echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
-    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
+    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/@PACKAGE@/CIM]"
     echo
     echo "Use to create sfcb provider registration and class repository."
     exit 0
@@ -75,7 +75,7 @@
 
 if [ -z "$cimschemadir" ]
 then
-    cimschemadir=@datadir@/sfcb/CIM
+    cimschemadir=@datadir@/@PACKAGE@/CIM
 fi
 
 if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&