[sblim-cmpi-base/f14/master] Obsoleted sblim-cmpi-base-test, restarting tog-pegasus properly.

[Praveen K Paladugu]

commit b1f1a4f64d94cfbcc8529a562f04b768aaee3d6e
Author: Praveen K Paladugu <praveenp at praveenp-dell.us.dell.com>
Date:   Wed Oct 6 13:17:51 2010 -0500

    Obsoleted sblim-cmpi-base-test, restarting tog-pegasus properly.

 .gitignore           |    2 ++
 sblim-cmpi-base.spec |   21 ++++++++++++++++-----
 sources              |    2 ++
 3 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac081ba..2b66d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ sblim-cmpi-base-1.5.5.tar.bz2
 sblim-cmpi-base-1.5.7.tar.bz2
 sblim-cmpi-base-1.5.9.tar.bz2
 sblim-cmpi-base-1.6.0.tar.bz2
+sblim-cmpi-base-1.6.0-methods-enable.patch
+sblim-cmpi-base-1.6.0-missing-fclose.patch
diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec
index 688a416..caf65e1 100644
--- a/sblim-cmpi-base.spec
+++ b/sblim-cmpi-base.spec
@@ -1,13 +1,15 @@
 
 Name:           sblim-cmpi-base
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM CMPI Base Providers
 
 Group:          Applications/System
 License:        CPL
 URL:            http://sblim.wiki.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Patch0:		sblim-cmpi-base-1.6.0-methods-enable.patch
+Patch1:		sblim-cmpi-base-1.6.0-missing-fclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      cim-schema cim-server
 BuildRequires:  sblim-cmpi-devel
@@ -32,6 +34,8 @@ Summary: SBLIM CMPI Base Providers Test Cases
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 Requires: sblim-testsuite
+Provides:	sblim-cmpi-base-test = 1.6.0
+Obsoletes:      sblim-cmpi-base-test = 1.5.9
 
 %description testsuite
 SBLIM (Standards Based Linux Instrumentation for Manageability)
@@ -40,6 +44,8 @@ Testcase Files for the SBLIM Testsuite.
 
 %prep
 %setup -q
+%patch0
+%patch1
 
 %build
 %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
@@ -104,10 +110,10 @@ fi
 /sbin/ldconfig
 # Register Schema and Provider - this is higly provider specific  
 # tog-pegasus needs some schemes registered first  
- if [ -x /usr/bin/peg-loadmof.sh ]; then  
-     peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof  
-     rctog-pegasus try-restart  
- fi  
+if [ -x /usr/bin/peg-loadmof.sh ]; then  
+     peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof
+     /sbin/service tog-pegasus try-restart > /dev/null 2>&1 || :;
+fi  
 
 if [ $1 -ge 1 ]
 then
@@ -131,6 +137,11 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Oct  6 2010 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.6.0-2
+- Added the patches from upstream packaging
+- Obselete sblim-cmpi-base-test package
+- fix to restart tog-pegasus properly 
+
 * Fri Sep 24 2010 Praveen K Paladugu <praveen_paladugu at dell.com>- 1.6.0-1
 - Updated to 1.6.0
 - Changed the spec to remove CIMOM dependencies.
diff --git a/sources b/sources
index 38c115e..0f7e633 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 1a4224dcbf6b5f23c204cd8f9e168fce  sblim-cmpi-base-1.6.0.tar.bz2
+3287c4b27080869d15b7ae00a053369e  sblim-cmpi-base-1.6.0-methods-enable.patch
+673af5c6011c6deecd751ac819df0d36  sblim-cmpi-base-1.6.0-missing-fclose.patch