From 1bc9876c1d44280284c022fbc211defc700048d9 Mon Sep 17 00:00:00 2001 From: vcrhonek Date: Tue, 1 Jul 2008 13:14:20 +0000 Subject: [PATCH] Update to 1.5.5, Spec file revision --- .cvsignore | 1 + sblim-cmpi-base.spec | 171 ++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 115 insertions(+), 59 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0273778..de54a6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ sblim-cmpi-base-1.5.4.tar.bz2 +sblim-cmpi-base-1.5.5.tar.bz2 diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec index 99b4f0a..1b92644 100644 --- a/sblim-cmpi-base.spec +++ b/sblim-cmpi-base.spec @@ -1,124 +1,179 @@ # -# $Id: sblim-cmpi-base.spec,v 1.7 2008/02/19 04:31:51 jkeating Exp $ +# $Id: sblim-cmpi-base.spec,v 1.8 2008/07/01 13:14:20 vcrhonek Exp $ # -# Package spec for sblim-cmpi-base - RedHat/Fedora Flavor +# Package spec for sblim-cmpi-base - Red Hat/Fedora Flavor # # Use this SPEC if building for a RH/Fedora System for usage with # OpenPegasus # -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define tog_pegasus_version 2:2.6.1-1 +%define sblim_testsuite_version 1.2.4-1 +%define provider_dir %{_libdir}/cmpi -Summary: SBLIM Base Providers +Summary: SBLIM CMPI Base Providers Name: sblim-cmpi-base -Version: 1.5.4 -Release: 8%{?dist} -Group: Systems Management/Base +Version: 1.5.5 +Release: 1%{?dist} +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.sblim.org License: CPL - Source0: http://download.sourceforge.net/pub/sourceforge/s/sb/sblim/%{name}-%{version}.tar.bz2 +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} +Requires: tog-pegasus -BuildRequires: tog-pegasus-devel >= 2.5 -Requires: tog-pegasus >= 2.5.1 +%description +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Providers +for System-Related CIM (Common Information Model) classes -%Description -Standards Based Linux Instrumentation Base CMPI Providers for -System-related CIM classes - -%Package devel -Summary: SBLIM Base Instrumentation Header Development Files -Group: Systems Management/Base +%package devel +Summary: SBLIM CMPI Base Providers Development Header Files +Group: Development/Libraries +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} Requires: %{name} = %{version}-%{release} +Requires: tog-pegasus -%Description devel -SBLIM Base Provider Development Package contains header files and -link libraries for dependent provider packages +%description devel +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Provider +development header files and link libraries -%Package test -Summary: SBLIM Base Instrumentation Testcase Files -Group: Systems Management/Base +%package test +Summary: SBLIM CMPI Base Providers Test Cases +Group: Applications/System +BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version} Requires: %{name} = %{version}-%{release} -Requires: sblim-testsuite +Requires: sblim-testsuite = %{sblim_testsuite_version} +Requires: tog-pegasus -%Description test -SBLIM Base Provider Testcase Files for the SBLIM Testsuite +%description test +SBLIM (Standards Based Linux Instrumentation for Manageability) +CMPI (Common Manageability Programming Interface) Base Provider +Testcase Files for the SBLIM Testsuite %prep - %setup -q %build - %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \ - CIMSERVER=pegasus -make %{?_smp_mflags} + PROVIDERDIR=%{provider_dir} \ + CIMSERVER=pegasus +make %install - rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install - +cp -fp *OSBase_UnixProcess.h $RPM_BUILD_ROOT/%{_includedir}/sblim +chmod 644 $RPM_BUILD_ROOT/%{_includedir}/sblim/*OSBase_UnixProcess.h # remove unused libtool files rm -f $RPM_BUILD_ROOT/%{_libdir}/*a rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %pre - %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %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 \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; + %{_datadir}/%{name}/provider-register.sh \ + -d -t pegasus \ + -m %{SCHEMA} \ + -r %{REGISTRATION} > /dev/null 2>&1 || :; + # don't let registration failure when server not running fail upgrade! fi %post -# Register Schema and Provider - this is higly provider specific - -%{_datadir}/%{name}/provider-register.sh -t pegasus \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; - /sbin/ldconfig +if [ $1 -ge 1 ] +then +# Register Schema and Provider - this is higly provider specific + %{_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! +fi %preun # Deregister only if not upgrading if [ $1 -eq 0 ] then - %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1 || :; + %{_datadir}/sblim-cmpi-base/provider-register.sh \ + -d -t pegasus \ + -m %{SCHEMA} \ + -r %{REGISTRATION} > /dev/null 2>&1 || :; + # don't let registration failure when server not running fail erase! fi -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig %clean - rm -rf $RPM_BUILD_ROOT %files - -%defattr(-,root,root) +%defattr(0644,root,pegasus,0755) %docdir %{_datadir}/doc/%{name}-%{version} -%{_datadir}/%{name} %{_datadir}/doc/%{name}-%{version} -%{_libdir}/*.so.* -%{_libdir}/cmpi/*.so +%defattr(-,root,pegasus,0755) +%{_datadir}/%{name} +%defattr(0750,root,pegasus,0750) +%{_libdir}/libcmpiOSBase_Common.so.* +%{_libdir}/libdmi*.so.* +%{provider_dir}/libcmpiOSBase_BaseBoardProvider.so +%{provider_dir}/libcmpiOSBase_CSBaseBoardProvider.so +%{provider_dir}/libcmpiOSBase_CSProcessorProvider.so +%{provider_dir}/libcmpiOSBase_ComputerSystemProvider.so +%{provider_dir}/libcmpiOSBase_OSProcessProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemStatisticalDataProvider.so +%{provider_dir}/libcmpiOSBase_OperatingSystemStatisticsProvider.so +%{provider_dir}/libcmpiOSBase_ProcessorProvider.so +%{provider_dir}/libcmpiOSBase_RunningOSProvider.so +%{provider_dir}/libcmpiOSBase_UnixProcessProvider.so %files devel - -%defattr(-,root,root) -%{_includedir}/* -%{_libdir}/*.so +%defattr(0644,root,pegasus,0755) +%dir %{_includedir}/sblim +%{_includedir}/sblim/*Base_Common.h +%{_includedir}/sblim/*OSBase_UnixProcess.h +%{_libdir}/libdmi*.so +%defattr(0750,root,pegasus,0750) +%{_libdir}/libcmpiOSBase_Common.so %files test - -%defattr(-,root,root) -%{_datadir}/sblim-testsuite +%defattr(-,root,pegasus,0755) +%{_datadir}/sblim-testsuite/test-cmpi-base.sh +%{_datadir}/sblim-testsuite/system/linux/createKeyFiles.sh +%{_datadir}/sblim-testsuite/system/linux/Linux_ComputerSystem.system +%{_datadir}/sblim-testsuite/system/linux/Linux_CSProcessor.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystemStatisticalData.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystemStatistics.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystem.system +%{_datadir}/sblim-testsuite/system/linux/Linux_OperatingSystem.version.sh +%{_datadir}/sblim-testsuite/system/linux/Linux_OSProcess.system +%{_datadir}/sblim-testsuite/system/linux/Linux_Processor.pl +%{_datadir}/sblim-testsuite/system/linux/Linux_Processor.system +%{_datadir}/sblim-testsuite/system/linux/Linux_RunningOS.system +%{_datadir}/sblim-testsuite/system/linux/Linux_UnixProcess.pl +%{_datadir}/sblim-testsuite/system/linux/Linux_UnixProcess.system +%{_datadir}/sblim-testsuite/cim/Linux_ComputerSystem.cim +%{_datadir}/sblim-testsuite/cim/Linux_CSProcessor.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystem.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystemStatisticalData.cim +%{_datadir}/sblim-testsuite/cim/Linux_OperatingSystemStatistics.cim +%{_datadir}/sblim-testsuite/cim/Linux_OSProcess.cim +%{_datadir}/sblim-testsuite/cim/Linux_Processor.cim +%{_datadir}/sblim-testsuite/cim/Linux_RunningOS.cim +%{_datadir}/sblim-testsuite/cim/Linux_UnixProcess.cim %changelog +* Tue Jul 1 2008 Vitezslav Crhonek - 1.5.5-1 +- Update to 1.5.5 +- Spec file revision + * Mon Feb 18 2008 Fedora Release Engineering - 1.5.4-8 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index ae2976b..436dce7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10d9959925e9a416928dce18532855dc sblim-cmpi-base-1.5.4.tar.bz2 +9dd46335c4e2a17b8150e0551fe84865 sblim-cmpi-base-1.5.5.tar.bz2