Hello community,
here is the log from the commit of package sblim-cmpi-base
checked in at Wed Jul 9 18:05:20 CEST 2008.
--------
--- sblim-cmpi-base/sblim-cmpi-base.changes 2007-08-06 03:55:11.000000000 +0200
+++ sblim-cmpi-base/sblim-cmpi-base.changes 2008-07-09 17:44:46.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Jul 9 09:44:15 MDT 2008 - npaxton@novell.com
+
+- Minor spec file cleanup
+ -remove 'rm -rf buildroot'
+ -move .la back to main pkg
+
+-------------------------------------------------------------------
+Mon Jul 7 11:27:23 MDT 2008 - npaxton@novell.com
+
+- Sync spec file between sle10-sp2 and stable
+- Add symlink to this package's provider-register.sh from
+ /usr/sbin : several other packages will use this package's
+ provider-register script, and can't access script in
+ fully-qualified path in /usr/share
+
+-------------------------------------------------------------------
+Fri May 30 13:08:57 MDT 2008 - npaxton@novell.com
+
+- change registration from loadmof to provider-register to support
+ multiple cimoms, then modified provider-register.sh to use
+ ow-loadmof.sh and ow-rmmof.sh for openwbem cimom
+- added dependency on sblim-indication_helper-devel so will build
+ indication support
+
+-------------------------------------------------------------------
New:
----
provider-register-with-ns.patch
provider-register-with-ow-loadmof.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-cmpi-base.spec ++++++
--- /var/tmp/diff_new_pack.b14549/_old 2008-07-09 18:02:30.000000000 +0200
+++ /var/tmp/diff_new_pack.b14549/_new 2008-07-09 18:02:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sblim-cmpi-base (Version 1.5.6)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,19 +10,20 @@
# norootforbuild
+
Name: sblim-cmpi-base
-BuildRequires: gcc-c++ openslp-devel openssl-devel pam-devel sblim-indication_helper-devel sblim-testsuite
+BuildRequires: gcc-c++ sblim-cmpi-devel sblim-indication_helper-devel sblim-testsuite
Version: 1.5.6
-Release: 1
+Release: 69
Group: System/Management
License: IBM Public License
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: cim-server
-PreReq: /usr/bin/loadmof.sh, /usr/bin/rmmof.sh
-URL: http://sblim.wiki.sourceforge.net/
-Source: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Requires: cim-server cim-schema
+Url: http://sblim.wiki.sourceforge.net/
+Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
Source1: sblim-cmpi-base-rpmlintrc
-#
+Patch0: provider-register-with-ns.patch
+Patch1: provider-register-with-ow-loadmof.patch
Summary: SBLIM Base Instrumentation
%description
@@ -35,6 +36,7 @@
SBLIM Project
%package devel
+License: IBM Public License
Summary: SBLIM Base Instrumentation Header Development Files
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -49,6 +51,7 @@
SBLIM Project
%package testsuite
+License: IBM Public License
Summary: SBLIM Base Instrumentation (test suite)
Group: System/Management
Requires: %{name} = %{version}
@@ -64,30 +67,52 @@
SBLIM Project
%prep
-%setup -q
+%setup -T -b 0 -n %{name}-%{version}
+%patch0 -b .provider-register-with-ns.patch
+%patch1 -b .provider-register-with-ow-loadmof.patch
%build
-%configure --disable-static
+autoreconf -fi
+%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
%{__make}
%install
%makeinstall docdir=%{_docdir}/%{name}
-# dont delete them until we sorted out if sblim/openwbem/pegasus are using ltdlopen()
+# don't delete .la's until we sort out if sfcb/openwbem/pegasus use ltdlopen()
# %{__rm} %{buildroot}%{_libdir}/{libcmpiOSBase_Common,libdmiinfo}.la
+# create symlink in /usr/sbin to provider-register.sh
+install -d $RPM_BUILD_ROOT/usr/sbin
+ln -sf %{_datadir}/%{name}/provider-register.sh $RPM_BUILD_ROOT/usr/sbin/provider-register.sh
+# remove unused libtool files
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
%clean
-%{__rm} -rf %{buildroot}
+
+%pre
+# definition of schema and registration files
+%define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof
+%define REGISTRATION %{_datadir}/%{name}/Linux_BaseIndication.registration
+# If upgrading, deregister old version
+if [ $1 -gt 1 ]
+then
+ %{_datadir}/%{name}/provider-register.sh -d \
+ -r %{REGISTRATION} -m %{SCHEMA} > /dev/null ||:
+fi
%post
+# Register Schema and Provider - this is higly provider specific
+%{_datadir}/%{name}/provider-register.sh \
+ -r %{REGISTRATION} -m %{SCHEMA} > /dev/null ||:
/sbin/ldconfig
-# compile MOF
-/usr/bin/loadmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_Base.mof
-/usr/bin/loadmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_BaseIndication.mof
%preun
-if [ "$1" = "0" ]; then
- /usr/bin/rmmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_BaseIndication.mof
- /usr/bin/rmmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_Base.mof
+# Deregister only if not upgrading
+if [ $1 -eq 0 ]
+then
+ %{_datadir}/%{name}/provider-register.sh -d \
+ -r %{REGISTRATION} -m %{SCHEMA} > /dev/null ||:
fi
%postun -p /sbin/ldconfig
@@ -96,13 +121,17 @@
%defattr(-,root,root)
%doc %{_docdir}/%{name}
%dir %{_libdir}/cmpi/
-%{_libdir}/cmpi/libcmpiOSBase*
+%{_libdir}/cmpi/libcmpiOSBase*.so
%{_libdir}/libcmpiOSBase_Common.so.*
%{_libdir}/libdmiinfo.so.*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/provider-register.sh
%{_datadir}/%{name}/Linux_Base*
-# needed atm
+%{_sbindir}/provider-register.sh
+%docdir %{_datadir}/doc/%{name}-%{version}
+%{_datadir}/%{name}
+%{_datadir}/doc/%{name}-%{version}
+#possibly needed atm, as per above comment... leaving for now
%{_libdir}/libcmpiOSBase_Common.la
%{_libdir}/libdmiinfo.la
@@ -115,6 +144,10 @@
%files testsuite
%defattr(-,root,root)
+%dir %{_datadir}/sblim-testsuite
+%dir %{_datadir}/sblim-testsuite/cim
+%dir %{_datadir}/sblim-testsuite/system
+%dir %{_datadir}/sblim-testsuite/system/linux
%{_datadir}/sblim-testsuite/test-cmpi-base.sh
%{_datadir}/sblim-testsuite/cim/Linux*.cim
%{_datadir}/sblim-testsuite/system/linux/*.pl
@@ -123,7 +156,23 @@
%{_datadir}/sblim-testsuite/system/linux/createKeyFiles.sh
%changelog
-* Mon Aug 06 2007 - mrueckert@suse.de
+* Wed Jul 09 2008 npaxton@novell.com
+- Minor spec file cleanup
+ -remove 'rm -rf buildroot'
+ -move .la back to main pkg
+* Mon Jul 07 2008 npaxton@novell.com
+- Sync spec file between sle10-sp2 and stable
+- Add symlink to this package's provider-register.sh from
+ /usr/sbin : several other packages will use this package's
+ provider-register script, and can't access script in
+ fully-qualified path in /usr/share
+* Fri May 30 2008 npaxton@novell.com
+- change registration from loadmof to provider-register to support
+ multiple cimoms, then modified provider-register.sh to use
+ ow-loadmof.sh and ow-rmmof.sh for openwbem cimom
+- added dependency on sblim-indication_helper-devel so will build
+ indication support
+* Sun Aug 05 2007 mrueckert@suse.de
- update to version 1.5.6
o Bugs
- 1626832 Test cases for class Linux_BaseBoard and association
@@ -137,48 +186,48 @@
sblim-cmpi-base-processutil.patch
- fixed and ignored a few rpmlint warnings
- no longer build static libs
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Jan 19 2006 - mrueckert@suse.de
+* Thu Jan 19 2006 mrueckert@suse.de
- replaced my header patch with a patch from upstream
-* Sun Jan 15 2006 - mrueckert@suse.de
+* Sun Jan 15 2006 mrueckert@suse.de
- fixed Makefile to install all headers. some headers where missing
but required for other modules.
-* Mon Nov 14 2005 - mrueckert@suse.de
+* Mon Nov 14 2005 mrueckert@suse.de
- Fix CPU detecion on ia64.[#95989]
-* Wed Oct 26 2005 - mrueckert@suse.de
+* Wed Oct 26 2005 mrueckert@suse.de
- Use openwbem instead of pegasuswbem.
- Update to version 1.5.4.
-* Mon Sep 26 2005 - mls@suse.de
+* Mon Sep 26 2005 mls@suse.de
- make devel package require base package
-* Mon Nov 15 2004 - ro@suse.de
+* Mon Nov 15 2004 ro@suse.de
- fixed file list
-* Wed May 19 2004 - nashif@suse.de
+* Tue May 18 2004 nashif@suse.de
- Fix issue with empty dnsdomainname resulting in grep errors
-* Mon May 17 2004 - ro@suse.de
+* Mon May 17 2004 ro@suse.de
- fix spec file
-* Wed May 12 2004 - nashif@suse.de
+* Wed May 12 2004 nashif@suse.de
- Do not deregister providers when updating package
-* Mon May 10 2004 - nashif@suse.de
+* Mon May 10 2004 nashif@suse.de
- #40275: consistence test for class Linux_Processor fails
on Linux on S390
- Dereigster providers when uninstalling (#39667)
-* Fri Apr 30 2004 - nashif@suse.de
+* Thu Apr 29 2004 nashif@suse.de
- Install testsuite files
-* Fri Apr 16 2004 - nashif@suse.de
+* Fri Apr 16 2004 nashif@suse.de
- Update version with bugfixes from IBM
-* Wed Apr 14 2004 - nashif@suse.de
+* Wed Apr 14 2004 nashif@suse.de
- Added PreReq for loadmof.sh (#38891)
-* Wed Apr 07 2004 - nashif@suse.de
+* Tue Apr 06 2004 nashif@suse.de
- Update to latest version from the sblim project
- register providers in %%post
- Requires cim-server
-* Mon Mar 29 2004 - ro@suse.de
+* Mon Mar 29 2004 ro@suse.de
- add x86_64/ia64 to platform.sh that code is just looking
at proc/cpuinfo anyway
-* Tue Mar 23 2004 - meissner@suse.de
+* Tue Mar 23 2004 meissner@suse.de
- really apply fpic patch.
-* Tue Mar 23 2004 - meissner@suse.de
+* Tue Mar 23 2004 meissner@suse.de
- fixed lib64 handling, added -fPIC and RPM_OPT_FLAGS.
-* Tue Mar 23 2004 - nashif@suse.de
+* Mon Mar 22 2004 nashif@suse.de
- Initial Release
++++++ provider-register-with-ns.patch ++++++
--- provider-register.sh.orig 2006-02-09 06:40:10.000000000 -0700
+++ provider-register.sh 2008-05-14 11:12:03.000000000 -0600
@@ -48,6 +48,8 @@
{
OUTFILE=$1
shift
+ namespace=$1
+ shift
regfiles=$*
PROVIDERMODULES=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 4 | sort | uniq`
if test x"$PROVIDERMODULES" = x
@@ -105,28 +107,30 @@
instance)
if test x$numcap = x
then numcap=2
- else numcap="$numcap, 2"
+ else numcap="$numcap,2"
fi;;
association)
if test x$numcap = x
then numcap=3
- else numcap="$numcap, 3"
+ else numcap="$numcap,3"
fi;;
indication)
- if test x$numcap = x
+ if test x$numcap = x
then numcap=4
- else numcap="$numcap, 4"
+ else numcap="$numcap,4"
fi;;
method)
if test x$numcap = x
then numcap=5
- else numcap="$numcap, 5"
+ else numcap="$numcap,5"
fi;;
**) echo unknown provider type $cap >&2
return 1;;
esac
done
- cat >> $OUTFILE <