[Sblim-commit] cmpi-base ChangeLog,1.12,1.13 NEWS,1.8,1.9 configure.ac,1.10,1.11 dmiinfo.c,1.1,1.2 sblim-cmpi-base.spec.in,1.9,1.10

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

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16354

Modified Files:
	ChangeLog NEWS configure.ac dmiinfo.c sblim-cmpi-base.spec.in 
Log Message:
Bugs fixed: 1236584, 1246639.
RPM Build Enhancements.
Removed debug output.


Index: sblim-cmpi-base.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/sblim-cmpi-base.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sblim-cmpi-base.spec.in	27 Jul 2005 16:01:09 -0000	1.9
+++ sblim-cmpi-base.spec.in	28 Jul 2005 10:36:51 -0000	1.10
@@ -8,7 +8,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 
-Summary: Sample CMPI Provider
+Summary: SBLIM Base Providers
 Name: @PACKAGE_TARNAME@
 Version: @PACKAGE_VERSION@
 Release: 1%{?tog_pegasus:.tog_pegasus}
@@ -22,7 +22,8 @@
 Requires: %{?tog_pegasus:tog-pegasus}%{!?tog_pegasus:cimserver}
 
 %Description
-Standards Based Linux Instrumentation Base Providers
+Standards Based Linux Instrumentation Base CMPI Providers for
+System-related CIM classes
 
 %Package devel
 Summary: SBLIM Base Instrumentation Header Development Files
@@ -30,7 +31,9 @@
 Requires: %{name} = %{version}
 
 %Description devel
-SBLIM Base Provider Development Package
+SBLIM Base Provider Development Package contains header files and 
+link libraries
+for dependent provider packages
 
 %Package test
 Summary: SBLIM Base Instrumentation Testcase Files
@@ -77,9 +80,8 @@
 %endif
 
 
-%post
-# Register Schema and Provider - this is higly provider specific
-
+%pre
+# Conditional definition of schema and registration files
 %if "@LINDHELP@" != ""
 %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof
 %define REGISTRATION %{_datadir}/%{name}/Linux_BaseIndication.registration
@@ -88,17 +90,35 @@
 %define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration
 %endif
 
+# If upgrading, deregister old version
+if [ $1 -gt 1 ]
+then
+  %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \
+	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
+fi
+
+%post
+# Register Schema and Provider - this is higly provider specific
+
 %{_datadir}/%{name}/provider-register.sh %{?tog_pegasus:-t pegasus} \
 	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
 
 /sbin/ldconfig
 
 %preun
-
-%{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \
+# Deregister only if not upgrading 
+if [ $1 -eq 0 ]
+then
+  %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \
 	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
+fi
 
-%postun -p /sbin/ldconfig
+%postun 
+# Run ldconfig only if not upgrading
+if [ $1 -eq 0 ]
+then
+  /sbin/ldconfig
+fi
 
 %files
 

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/NEWS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NEWS	12 Jul 2005 13:06:54 -0000	1.8
+++ NEWS	28 Jul 2005 10:36:51 -0000	1.9
@@ -4,6 +4,7 @@
 Bugs Fixed:
 - 1222571 Fixed segmentation fault on long process command lines.
 - 1236584 Better support for the peculiarities of tog-pegasus
+- 1246639 Removed debug output from libdmi
 
 Changes in 1.5.2
 ================

Index: dmiinfo.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/dmiinfo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dmiinfo.c	24 Jan 2005 11:29:05 -0000	1.1
+++ dmiinfo.c	28 Jul 2005 10:36:51 -0000	1.2
@@ -71,10 +71,12 @@
 	/* find DMI anchor */
 	for (dmif=biosptr;(void*)dmif<(biosptr+bioslen);dmif++) {
 	  if (memcmp("_DMI_",dmif->dmi_sig,5)==0) {
+#ifdef DEBUG
 	    printf("DMI Signature found at %08x\n",
 		   (void*)dmif-biosptr+offbios);
 	    printf("SMBIOS Structures reside at %08x\n",
 		   dmif->dmi_base);
+#endif
 	    break;
 	  }
 	}

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	26 Jul 2005 13:51:07 -0000	1.10
+++ configure.ac	28 Jul 2005 10:36:51 -0000	1.11
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.5.2b, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.5.3, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	12 Jul 2005 13:06:54 -0000	1.12
+++ ChangeLog	28 Jul 2005 10:36:51 -0000	1.13
@@ -1,3 +1,16 @@
+2005-07-28    <mih...@dy...>
+
+	* dmiinfo.c: 
+	Bug 1246639: Unwanted debug output removed.
+
+	* Makefile.am: 
+	Bug 1236584: Added per provider LDFLAGS to suppress version number
+	generation, as rpmlint doesn't like .so.n.n files and .so files
+	in the same RPM.
+
+	* sblim-cmpi-base.spec.in: 
+	Bug 1236584: Modified scriptlets to support RPM upgrade.
+	
 2005-07-12    <mih...@dy...>
 
 	* provider-register.sh: