From 74a1e362a6241816a88a831c29268e1cf6aca2ac Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 29 Aug 2013 13:29:10 +0200 Subject: [PATCH] Update to CIM Schema 2.37.0, including experimental classes, Fix for unversioned docdir change --- .gitignore | 2 ++ cim-schema.spec | 19 ++++++++++++------- sources | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 16220f8..ed21c27 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ cim_schema_2.25.0Final-MOFs.zip /cim_schema_2.29.0Final-Doc.zip /cim_schema_2.33.0Experimental-MOFs.zip /cim_schema_2.33.0Experimental-Doc.zip +/cim_schema_2.37.0Experimental-MOFs.zip +/cim_schema_2.37.0Experimental-Doc.zip diff --git a/cim-schema.spec b/cim-schema.spec index 8fb46c4..25725a9 100644 --- a/cim-schema.spec +++ b/cim-schema.spec @@ -32,14 +32,14 @@ # norootforbuild %global major 2 -%global minor 33 +%global minor 37 %global update 0 Name: cim-schema Url: http://www.dmtf.org/ Summary: Common Information Model (CIM) Schema Version: %{major}.%{minor}.%{update} -Release: 6%{?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 @@ -69,7 +69,7 @@ Authors: Common Information Model (CIM) schema documentation. %prep -%setup -q -T -a 1 -c -n %{name}-%{version}-docs +%setup -q -T -a 1 -c -n %{name}-docs %setup -q -T -a 0 -c -n %{name}-%{version} %build @@ -87,8 +87,8 @@ chmod -R a+rX . ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current ln -s cim_schema_%{version}.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof install -d $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} -cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name} +cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name} %clean %__rm -rf $RPM_BUILD_ROOT @@ -98,12 +98,17 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %dir %{_datarootdir}/mof/cimv%{version} %{_datarootdir}/mof/cimv%{version}/* %{_datarootdir}/mof/cim-current -%doc %{_docdir}/%{name}-%{version}/LICENSE +%doc %{_docdir}/%{name}/LICENSE %files docs -%doc ../%{name}-%{version}-docs/* +%doc ../%{name}-docs/* %changelog +* Thu Aug 29 2013 Vitezslav Crhonek - ..-1 +- Update to CIM Schema 2.37.0, including experimental classes +- Fix for unversioned docdir change + Resolves: #993697 + * Sat Aug 03 2013 Fedora Release Engineering - 2.33.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 204fd38..29dbed1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -854bc4694349b3eadeda040985880640 cim_schema_2.33.0Experimental-MOFs.zip -d10a8cc54407908431ad6be7032a2ce4 cim_schema_2.33.0Experimental-Doc.zip +e1b630e43d09360064f73c2fc8d4a6eb cim_schema_2.37.0Experimental-MOFs.zip +d2076eae8242cd73385caa3c5ccb5af0 cim_schema_2.37.0Experimental-Doc.zip