From 53632efe5705c1d0d6a5bf2aecb393de9b4a2322 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 2 Apr 2015 15:00:49 +0200 Subject: [PATCH] Update to CIM Schema 2.43.0, including experimental classes --- .gitignore | 2 ++ cim-schema-2.38.0-storage-pool-typo.patch | 42 ----------------------- cim-schema.spec | 10 +++--- sources | 4 +-- 4 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 cim-schema-2.38.0-storage-pool-typo.patch diff --git a/.gitignore b/.gitignore index 24e3e58..c058e78 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ cim_schema_2.25.0Final-MOFs.zip /cim_schema_2.37.0Experimental-Doc.zip /cim_schema_2.38.0Experimental-MOFs.zip /cim_schema_2.38.0Experimental-Doc.zip +/cim_schema_2.43.0Experimental-MOFs.zip +/cim_schema_2.43.0Experimental-Doc.zip diff --git a/cim-schema-2.38.0-storage-pool-typo.patch b/cim-schema-2.38.0-storage-pool-typo.patch deleted file mode 100644 index 81e7da1..0000000 --- a/cim-schema-2.38.0-storage-pool-typo.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up ./cim-schema-2.38.0/Device/CIM_StoragePool.mof.orig ./cim-schema-2.38.0/Device/CIM_StoragePool.mof ---- ./cim-schema-2.38.0/Device/CIM_StoragePool.mof.orig 2013-10-07 12:25:30.959185445 +0200 -+++ ./cim-schema-2.38.0/Device/CIM_StoragePool.mof 2013-10-07 12:26:14.942381766 +0200 -@@ -248,7 +248,7 @@ class CIM_StoragePool : CIM_ResourcePool - "reported. The Thin Provision values are only " - "supported when the Thin Provisioning Profile is " - "supported; the resulting StorageVolues/LogicalDisk " -- "shall have ThinlyPprovisioned set to true." ), -+ "shall have ThinlyProvisioned set to true." ), - ValueMap { "2", "3", "4", "5", "6" }, - Values { "Storage Pool", "Storage Volume", - "Logical Disk", "Thin Provisioned Volume", -@@ -286,7 +286,7 @@ class CIM_StoragePool : CIM_ResourcePool - "only supported when the Thin Provisioning Profile " - "is supported; the resulting " - "StorageVolues/LogicalDisk shall have " -- "ThinlyPprovisioned set to true." ), -+ "ThinlyProvisioned set to true." ), - ValueMap { "2", "3", "4", "5", "6" }, - Values { "Storage Pool", "Storage Volume", - "Logical Disk", "Thin Provisioned Volume", -diff -up ./cim-schema-docs/CIM_StoragePool.html.orig ./cim-schema-docs/CIM_StoragePool.html ---- ./cim-schema-docs/CIM_StoragePool.html.orig 2013-10-07 12:25:42.063235238 +0200 -+++ ./cim-schema-docs/CIM_StoragePool.html 2013-10-07 12:26:37.246480263 +0200 -@@ -412,7 +412,7 @@ Conceptually TotalManagedSpace is the su - ElementTypeuint16 - - --DescriptionstringThe type of element for which supported sizes are reported. The Thin Provision values are only supported when the Thin Provisioning Profile is supported; the resulting StorageVolues/LogicalDisk shall have ThinlyPprovisioned set to true. -+DescriptionstringThe type of element for which supported sizes are reported. The Thin Provision values are only supported when the Thin Provisioning Profile is supported; the resulting StorageVolues/LogicalDisk shall have ThinlyProvisioned set to true. - - - Experimentalbooleantrue -@@ -484,7 +484,7 @@ Conceptually TotalManagedSpace is the su - ElementTypeuint16 - - --DescriptionstringThe type of element for which supported size ranges are reported. The Thin Provision values are only supported when the Thin Provisioning Profile is supported; the resulting StorageVolues/LogicalDisk shall have ThinlyPprovisioned set to true. -+DescriptionstringThe type of element for which supported size ranges are reported. The Thin Provision values are only supported when the Thin Provisioning Profile is supported; the resulting StorageVolues/LogicalDisk shall have ThinlyProvisioned set to true. - - - Experimentalbooleantrue diff --git a/cim-schema.spec b/cim-schema.spec index f603329..706eb78 100644 --- a/cim-schema.spec +++ b/cim-schema.spec @@ -32,22 +32,20 @@ # norootforbuild %global major 2 -%global minor 38 +%global minor 43 %global update 0 Name: cim-schema Url: http://www.dmtf.org/ Summary: Common Information Model (CIM) Schema Version: %{major}.%{minor}.%{update} -Release: 3%{?dist} +Release: 1%{?dist} Group: Development/Libraries License: DMTF Source0: http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-MOFs.zip Source1: http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-Doc.zip Source2: LICENSE BuildArch: noarch -# Patch0: Fixes typo in CIM_StoragePool.mof, bz#1015983 -Patch0: cim-schema-2.38.0-storage-pool-typo.patch %package docs Summary: Common Information Model (CIM) Schema documentation @@ -73,7 +71,6 @@ Common Information Model (CIM) schema documentation. %prep %setup -q -T -a 1 -c -n %{name}-docs %setup -q -T -a 0 -c -n %{name}-%{version} -%patch0 -p1 -d .. -b .storage-pool-typo %build %install @@ -107,6 +104,9 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name} %doc ../%{name}-docs/* %changelog +* Thu Apr 02 2015 Vitezslav Crhonek - 2.43.0-1 +- Update to CIM Schema 2.43.0, including experimental classes + * Sat Jun 07 2014 Fedora Release Engineering - 2.38.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index c2301e2..946634a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e5cad2e960f80dda4390bf422dd7f164 cim_schema_2.38.0Experimental-MOFs.zip -7fad33ab8201f4ccdb41b525f8abf206 cim_schema_2.38.0Experimental-Doc.zip +327d8405867e24a586d3ec0efb7ff8b8 cim_schema_2.43.0Experimental-MOFs.zip +42bcf2ef4fed12eb5093531d894c12cf cim_schema_2.43.0Experimental-Doc.zip