[sblim-cmpi-params] Update to sblim-cmpi-params-1.3.0, Remove CIMOM dependencies
vcrhonek
vcrhonek at fedoraproject.org
Wed Oct 6 12:22:09 UTC 2010
commit 6e6c9f370d3b05e2bbeda375af42c449de6ca1dc
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed Oct 6 14:22:14 2010 +0200
Update to sblim-cmpi-params-1.3.0, Remove CIMOM dependencies
.gitignore | 1 +
sblim-cmpi-params.spec | 54 +++++++++++++++++++++++++++--------------------
sources | 2 +-
3 files changed, 33 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f21644..fa63170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sblim-cmpi-params-1.2.6.tar.bz2
+/sblim-cmpi-params-1.3.0.tar.bz2
diff --git a/sblim-cmpi-params.spec b/sblim-cmpi-params.spec
index 465e378..14a57a7 100644
--- a/sblim-cmpi-params.spec
+++ b/sblim-cmpi-params.spec
@@ -1,22 +1,19 @@
-%define tog_pegasus_version 2:2.6.1-1
%define provider_dir %{_libdir}/cmpi
Name: sblim-cmpi-params
-Version: 1.2.6
+Version: 1.3.0
Release: 1%{?dist}
Summary: SBLIM params instrumentation
Group: Applications/System
-License: CPL
+License: EPL
URL: http://sblim.wiki.sourceforge.net/
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
Patch0: sblim-cmpi-params-1.2.4-no-abi-params.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
-BuildRequires: sblim-cmpi-base-devel
-Requires: tog-pegasus >= %{tog_pegasus_version}
-Requires: sblim-cmpi-base
+BuildRequires: sblim-cmpi-devel sblim-cmpi-base-devel
+Requires: sblim-cmpi-base cim-server cim-schema
%description
Standards Based Linux Instrumentation Params Providers
@@ -26,7 +23,6 @@ Summary: SBLIM Params Instrumentation Testcases
Group: Applications/System
Requires: sblim-cmpi-params = %{version}-%{release}
Requires: sblim-testsuite
-Requires: tog-pegasus
%description -n sblim-cmpi-params-test
SBLIM Base Params Testcase Files for SBLIM Testsuite
@@ -37,8 +33,8 @@ SBLIM Base Params Testcase Files for SBLIM Testsuite
%build
%configure \
+ --disable-static \
TESTSUITEDIR=%{_datadir}/sblim-testsuite \
- CIMSERVER=pegasus \
PROVIDERDIR=%{provider_dir}
make %{?_smp_mflags}
@@ -46,50 +42,62 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
-rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{provider_dir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,0755)
-%{provider_dir}/*Parameter.so*
+%defattr(-,root,root,-)
+%{provider_dir}/*.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%files test
-%defattr(-,root,root,0755)
-%{_datadir}/sblim-testsuite/sblim-cmpi-params-test.sh
-%{_datadir}/sblim-testsuite/cim/Linux_*Parameter.cim
-%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.system
-%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.sh
+%defattr(-,root,root,-)
+%{_datadir}/sblim-testsuite
-%define PARAMS_SCHEMA %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.mof %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.mof %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.mof %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.mof
-%define PARAMS_REGISTRATION %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.registration %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.registration %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.registration \%{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.registration %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.registration
+%define PEGASUS_MOF CIM_UnixLocalFileSystem
%pre
+# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
%{_datadir}/sblim-cmpi-params/provider-register.sh -d \
- -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof > /dev/null 2>&1 || :;
fi
%post
/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 > /dev/null 2>&1 || :;
+ /sbin/service tog-pegasus try-restart > /dev/null 2>&1 || :;
+fi
+# The follwoing script will handle the registration for various CIMOMs
if [ $1 -ge 1 ]; then
%{_datadir}/sblim-cmpi-params/provider-register.sh \
- -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof > /dev/null 2>&1 || :;
fi
%preun
+# Deregister only if not upgrading
if [ $1 -eq 0 ]; then
%{_datadir}/sblim-cmpi-params/provider-register.sh -d \
- -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof > /dev/null 2>&1 || :;
fi
%postun -p /sbin/ldconfig
%changelog
+* Wed Oct 6 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.0-1
+- Update to sblim-cmpi-params-1.3.0
+- Remove CIMOM dependencies
+
* Mon Jun 1 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.6-1
- Initial support
diff --git a/sources b/sources
index d6349d7..280efe1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-159bd76b424fb2d14f3449c35c46393a sblim-cmpi-params-1.2.6.tar.bz2
+f210fd73d26346c9dc8d2944c1aa9a44 sblim-cmpi-params-1.3.0.tar.bz2
More information about the scm-commits
mailing list