Hello community, here is the log from the commit of package libvirt-cim for openSUSE:Factory checked in at Tue Aug 11 17:53:28 CEST 2009. -------- --- libvirt-cim/libvirt-cim.changes 2008-12-09 19:49:38.000000000 +0100 +++ libvirt-cim/libvirt-cim.changes 2009-08-08 00:51:05.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 7 16:35:25 MDT 2009 - jfehlig@novell.com + +- Updated to version 0.5.6 + - Storage pool support + - Network pool support + - Update to CIM schema 2.21 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 774-maxvcpu.patch 776-snap-service-job.patch 777-diskpool-fix.patch clock1.patch clock2.patch clock3.patch clock4.patch default-net-source.patch disk-flags.patch disk-rasd-emu-type.patch disk-type.patch emulator-device.patch gdev-listen.patch graphics-device.patch keymap.patch libvirt-cim-0.5.2.tar.bz2 lxc-procrasd.patch lxc-sched-param.patch lxc-sched-procrasd.patch proc-rasd.patch rm-console-prov.patch rm-dup-217-schema.patch vcpu-count.patch New: ---- libvirt-cim-0.5.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-cim.spec ++++++ --- /var/tmp/diff_new_pack.YEo9Q2/_old 2009-08-11 17:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.YEo9Q2/_new 2009-08-11 17:52:56.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libvirt-cim (Version 0.5.2) +# spec file for package libvirt-cim (Version 0.5.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,37 +25,16 @@ License: LGPL v2.1 or later Group: System/Management AutoReqProv: yes -Version: 0.5.2 -Release: 7 +Version: 0.5.6 +Release: 1 Summary: CMPI-based CIM provider implementing DMTF SVPC model Source: %{name}-%{version}.tar.bz2 Source1: libvirt-cim-rpmlintrc -Patch0: rm-dup-217-schema.patch -Patch1: provider-reg.patch -Patch2: versions.patch -Patch3: lxc-procrasd.patch -Patch4: lxc-sched-param.patch -Patch5: lxc-sched-procrasd.patch -Patch6: vcpu-count.patch -Patch7: proc-rasd.patch -Patch8: eth-device.patch -Patch9: graphics-device.patch -Patch10: disk-flags.patch -Patch11: rm-console-prov.patch -Patch12: keymap.patch -Patch13: disk-rasd-emu-type.patch -Patch14: disk-type.patch -Patch15: default-net-source.patch -Patch16: emulator-device.patch -Patch17: 774-maxvcpu.patch -Patch18: 776-snap-service-job.patch -Patch19: 777-diskpool-fix.patch -Patch20: gdev-listen.patch -Patch21: clock1.patch -Patch22: clock2.patch -Patch23: clock3.patch -Patch24: clock4.patch -Patch25: automake.patch +Patch0: provider-reg.patch +Patch1: versions.patch +Patch2: automake.patch +#Patch3: rm-base-schema.patch +#Patch4: eth-device.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cim-server Requires: libxml2 >= 2.6.0 @@ -79,37 +58,22 @@ %define REGISTRATION %{_datadir}/%{name}/*.registration %define SCHEMA %{_datadir}/%{name}/*.mof -%define INTEROP_REGISTRATION %{_datadir}/%{name}/RegisteredProfile.registration %{_datadir}/%{name}/ElementConformsToProfile.registration %{_datadir}/%{name}/ReferencedProfile.registration -%define INTEROP_SCHEMA %{_datadir}/%{name}/ComputerSystem.mof %{_datadir}/%{name}/HostSystem.mof %{_datadir}/%{name}/RegisteredProfile.mof %{_datadir}/%{name}/ElementConformsToProfile.mof %{_datadir}/%{name}/ReferencedProfile.mof +%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfil +e}.registration +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,Memory +Pool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile,AllocationC +apabilities}.mof +%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDe +pendency,ElementConformsToProfile,HostedAccessPoint}.registration +%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDe +pendency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 +#%patch3 -p1 chmod -x src/* libxkutil/* schema/* README doc/* base_schema/README* chmod +X src/* libxkutil/* schema/* @@ -125,10 +89,10 @@ %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.{a,la} %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libxkutil.so %{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name} -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/install_base_schema.sh -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216-interop_mof -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216Experimental-MOFs.zip -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fix_schema.patch +#%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/install_base_schema.sh +#%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216-interop_mof +#%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216Experimental-MOFs.zip +#%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fix_schema.patch mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/cim %clean @@ -139,27 +103,29 @@ [ $1 -eq 1 ] && exit 0 %{_datadir}/%{name}/provider-register.sh -d -t sfcb \ -n root/virt \ - -r %{REGISTRATION} -m %{SCHEMA} || true -%{_datadir}/%{name}/provider-register.sh -d -t sfcb \ - -n root/interop \ - -r %{INTEROP_REGISTRATION} -m %{INTEROP_SCHEMA} || true + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %post /sbin/ldconfig +%{_datadir}/%{name}/install_base_schema.sh %{_datadir}/%{name} +/etc/init.d/sfcb restart +%{_datadir}/%{name}/provider-register.sh -t sfcb \ + -n root/virt \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %{_datadir}/%{name}/provider-register.sh -t sfcb \ -n root/virt \ - -r %{REGISTRATION} -m %{SCHEMA} || true + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %{_datadir}/%{name}/provider-register.sh -t sfcb \ -n root/interop \ - -r %{INTEROP_REGISTRATION} -m %{INTEROP_SCHEMA} || true + -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t sfcb \ + -n root/cimv2\ + -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true %preun %{_datadir}/%{name}/provider-register.sh -d -t sfcb \ -n root/virt \ - -r %{REGISTRATION} -m %{SCHEMA} || true -%{_datadir}/%{name}/provider-register.sh -d -t sfcb \ - -n root/interop \ - -r %{INTEROP_REGISTRATION} -m %{INTEROP_SCHEMA} || true + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %postun -p /sbin/ldconfig @@ -171,6 +137,9 @@ %{_datadir}/%{name}/*.sh %{_datadir}/%{name}/*.mof %{_datadir}/%{name}/*.registration +%{_datadir}/%{name}/cim_schema_*-MOFs.zip +%{_datadir}/%{name}/cimv*-cimv2_mof +%{_datadir}/%{name}/cimv*-interop_mof %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim %changelog ++++++ libvirt-cim-0.5.2.tar.bz2 -> libvirt-cim-0.5.6.tar.bz2 ++++++ ++++ 70132 lines of diff (skipped) ++++++ versions.patch ++++++ --- /var/tmp/diff_new_pack.YEo9Q2/_old 2009-08-11 17:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.YEo9Q2/_new 2009-08-11 17:52:58.000000000 +0200 @@ -1,22 +1,40 @@ -Index: libvirt-cim-0.5.1/schema/VirtualSystemManagementService.mof +Index: libvirt-cim-0.5.6/schema/VirtualSystemManagementService.mof =================================================================== ---- libvirt-cim-0.5.1.orig/schema/VirtualSystemManagementService.mof -+++ libvirt-cim-0.5.1/schema/VirtualSystemManagementService.mof -@@ -8,6 +8,9 @@ class Xen_VirtualSystemManagementService +--- libvirt-cim-0.5.6.orig/schema/VirtualSystemManagementService.mof ++++ libvirt-cim-0.5.6/schema/VirtualSystemManagementService.mof +@@ -11,6 +11,9 @@ class Xen_VirtualSystemManagementService - [Description("HG revision number of the providers")] - string Revision; + [Description("Package Version")] + string Release; ++ ++ [Description("libvirt Version")] ++ string LibvirtVersion; + }; + + [Provider("cmpi::Virt_VirtualSystemManagementService")] +@@ -24,6 +27,9 @@ class KVM_VirtualSystemManagementService + + [Description("Package Version")] + string Release; + -+ [Description("LibVirt Version")] ++ [Description("libvirt Version")] + string LibvirtVersion; }; [Provider("cmpi::Virt_VirtualSystemManagementService")] -Index: libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c +@@ -37,4 +43,7 @@ class LXC_VirtualSystemManagementService + + [Description("Package Version")] + string Release; ++ ++ [Description("libvirt Version")] ++ string LibvirtVersion; + }; +Index: libvirt-cim-0.5.6/src/Virt_VirtualSystemManagementService.c =================================================================== ---- libvirt-cim-0.5.1.orig/src/Virt_VirtualSystemManagementService.c -+++ libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c -@@ -1875,8 +1875,10 @@ CMPIStatus get_vsms(const CMPIObjectPath +--- libvirt-cim-0.5.6.orig/src/Virt_VirtualSystemManagementService.c ++++ libvirt-cim-0.5.6/src/Virt_VirtualSystemManagementService.c +@@ -2306,8 +2306,10 @@ CMPIStatus get_vsms(const CMPIObjectPath const char *ccname = NULL; virConnectPtr conn = NULL; unsigned long hv_version = 0; @@ -24,17 +42,14 @@ const char * hv_type = NULL; char *caption = NULL; + char *lv_version_string = NULL; + CMPIArray *array; + uint16_t op_status; - *_inst = NULL; - conn = connect_by_classname(broker, CLASSNAME(reference), &s); -@@ -1951,7 +1953,26 @@ CMPIStatus get_vsms(const CMPIObjectPath - (CMPIValue *)LIBVIRT_CIM_CS, CMPI_chars); - +@@ -2386,6 +2388,25 @@ CMPIStatus get_vsms(const CMPIObjectPath CMSetProperty(inst, "Revision", -- (CMPIValue *)LIBVIRT_CIM_RV, CMPI_chars); -+ (CMPIValue *)PACKAGE_VERSION, CMPI_chars); -+ -+ if (virGetVersion(&lv_version, "Xen", &hv_version) < 0) { + (CMPIValue *)LIBVIRT_CIM_RV, CMPI_chars); + ++ if (virGetVersion(&lv_version, hv_type, &hv_version) < 0) { + CU_DEBUG("Unable to get libvirt version"); + lv_version= 0; + hv_version= 0; @@ -51,11 +66,12 @@ + (CMPIValue *)lv_version_string, CMPI_chars); + else + CMSetProperty(inst, "LibvirtVersion", -+ (CMPIValue *)"Unknown Libvirt", CMPI_chars); ++ (CMPIValue *)"Unknown libvirt", CMPI_chars); ++ + CMSetProperty(inst, "Release", + (CMPIValue *)PACKAGE_VERSION, CMPI_chars); - if (is_get_inst) { - s = cu_validate_ref(broker, reference, inst); -@@ -1964,6 +1985,7 @@ CMPIStatus get_vsms(const CMPIObjectPath +@@ -2410,6 +2431,7 @@ CMPIStatus get_vsms(const CMPIObjectPath ""); out: free(caption); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org