Updated to 1.6.0 and added the relevant patches
This commit is contained in:
Praveen K Paladugu
parent
806a81a52d
commit
1e9d2382b1
3
.gitignore
vendored
3
.gitignore
vendored
@ -2,3 +2,6 @@ sblim-cmpi-base-1.5.4.tar.bz2
|
||||
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
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
%define tog_pegasus_version 2:2.5.1
|
||||
%define provider_dir %{_libdir}/cmpi
|
||||
|
||||
Name: sblim-cmpi-base
|
||||
Version: 1.5.9
|
||||
Version: 1.6.0
|
||||
Release: 1%{?dist}
|
||||
Summary: SBLIM CMPI Base Providers
|
||||
|
||||
@ -10,10 +7,12 @@ 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-missing-fclose.patch
|
||||
Patch1: sblim-cmpi-base-1.6.0-methods-enable.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: cim-schema cim-server
|
||||
BuildRequires: sblim-cmpi-devel
|
||||
|
||||
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
|
||||
Requires: tog-pegasus >= %{tog_pegasus_version}
|
||||
|
||||
%description
|
||||
SBLIM (Standards Based Linux Instrumentation for Manageability)
|
||||
@ -23,7 +22,6 @@ for System-Related CIM (Common Information Model) classes.
|
||||
%package devel
|
||||
Summary: SBLIM CMPI Base Providers Development Header Files
|
||||
Group: Development/Libraries
|
||||
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -31,25 +29,26 @@ SBLIM (Standards Based Linux Instrumentation for Manageability)
|
||||
CMPI (Common Manageability Programming Interface) Base Provider
|
||||
development header files and link libraries.
|
||||
|
||||
%package test
|
||||
%package testsuite
|
||||
Summary: SBLIM CMPI Base Providers Test Cases
|
||||
Group: Applications/System
|
||||
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: sblim-testsuite
|
||||
Provides: sblim-cmpi-base-test = 1.6.0
|
||||
Obsoletes: sblim-cmpi-base-test = 1.5.9
|
||||
|
||||
%description test
|
||||
%description testsuite
|
||||
SBLIM (Standards Based Linux Instrumentation for Manageability)
|
||||
CMPI (Common Manageability Programming Interface) Base Provider
|
||||
Testcase Files for the SBLIM Testsuite.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
|
||||
%build
|
||||
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
|
||||
PROVIDERDIR=%{provider_dir} \
|
||||
CIMSERVER=pegasus
|
||||
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
make
|
||||
@ -73,25 +72,34 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/doc/%{name}-%{version}
|
||||
%{_datadir}/%{name}
|
||||
%{_libdir}/*.so.*
|
||||
%{provider_dir}/*.so*
|
||||
%{_libdir}/cmpi/*.so*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
|
||||
%files test
|
||||
%files testsuite
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/sblim-testsuite
|
||||
%dir %{_datadir}/sblim-testsuite/cim
|
||||
%dir %{_datadir}/sblim-testsuite/system
|
||||
%dir %{_datadir}/sblim-testsuite/system/linux
|
||||
%dir %{_datadir}/sblim-testsuite/test-cmpi-base.sh
|
||||
%{_datadir}/sblim-testsuite/cim/*.cim
|
||||
%{_datadir}/sblim-testsuite/system/linux/*.system
|
||||
%{_datadir}/sblim-testsuite/system/linux/*.sh
|
||||
%{_datadir}/sblim-testsuite/system/linux/*.pl
|
||||
|
||||
|
||||
|
||||
%pre
|
||||
%define SCHEMA %{_datadir}/%{name}/Linux_Base.mof
|
||||
%define PEGASUS_MOF CIM_Card,CIM_UnixProcess,CIM_Processor,CIM_OperatingSystem,CIM_ComputerSystem,CIM_ComputerSystemPackage,CIM_RunningOS,CIM_OSProcess,CIM_SystemDevice,CIM_ProcessIndication,CIM_ElementStatisticalData
|
||||
%define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration
|
||||
# If upgrading, deregister old version
|
||||
if [ $1 -gt 1 ]
|
||||
then
|
||||
%{_datadir}/%{name}/provider-register.sh \
|
||||
-d -t pegasus \
|
||||
%{_datadir}/%{name}/provider-register.sh -d \
|
||||
-m %{SCHEMA} \
|
||||
-r %{REGISTRATION} > /dev/null 2>&1 || :;
|
||||
# don't let registration failure when server not running fail upgrade!
|
||||
@ -99,11 +107,17 @@ 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
|
||||
/sbin/service tog-pegasus try-restart > /dev/null 2>&1 || :;
|
||||
fi
|
||||
|
||||
if [ $1 -ge 1 ]
|
||||
then
|
||||
# Register Schema and Provider - this is higly provider specific
|
||||
# The follwoing script will handle the registration for various CIMOMs.
|
||||
%{_datadir}/%{name}/provider-register.sh \
|
||||
-t pegasus \
|
||||
-m %{SCHEMA} \
|
||||
-r %{REGISTRATION} > /dev/null 2>&1 || :;
|
||||
# don't let registration failure when server not running fail install!
|
||||
@ -113,8 +127,7 @@ fi
|
||||
# Deregister only if not upgrading
|
||||
if [ $1 -eq 0 ]
|
||||
then
|
||||
%{_datadir}/%{name}/provider-register.sh \
|
||||
-d -t pegasus \
|
||||
%{_datadir}/%{name}/provider-register.sh -d \
|
||||
-m %{SCHEMA} \
|
||||
-r %{REGISTRATION} > /dev/null 2>&1 || :;
|
||||
# don't let registration failure when server not running fail erase!
|
||||
@ -123,6 +136,13 @@ fi
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Oct 6 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 1.6.0-1
|
||||
- Updated to 1.6.0
|
||||
- removed the CIMOM dependencies
|
||||
- following the upstream packaging obsolete, sblim-cmpi-base-test pkg.
|
||||
- Added the patches from upstream packaging
|
||||
- fix to restart tog-pegasus properly
|
||||
|
||||
* Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.5.9-1
|
||||
- Update to 1.5.9
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1 +1,3 @@
|
||||
4524287b30a6dd623274354086044f68 sblim-cmpi-base-1.5.9.tar.bz2
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user