From 0f7a0e8f353b4c6679439a2bf33562f18c130bf1c823d54f87a8159038aaf627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Mon, 22 Jun 2015 12:42:25 +0000
Subject: [PATCH] Accepting request 313050 from
 home:kstreitova:branches:systemsmanagement:wbem

- Upgrade to version 2.44.0
  http://dmtf.org/sites/default/files/cim/cim_schema_v2440/releasenotes.html
- use spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/313050
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/cim-schema?expand=0&rev=35
---
 cim-schema.changes                     |  7 ++++
 cim-schema.spec                        | 51 +++++++++++++-------------
 cim_schema_2.43.0Experimental-MOFs.zip |  3 --
 cim_schema_2.44.0Experimental-MOFs.zip |  3 ++
 4 files changed, 35 insertions(+), 29 deletions(-)
 delete mode 100644 cim_schema_2.43.0Experimental-MOFs.zip
 create mode 100644 cim_schema_2.44.0Experimental-MOFs.zip

diff --git a/cim-schema.changes b/cim-schema.changes
index ddc9379..e9cd38d 100644
--- a/cim-schema.changes
+++ b/cim-schema.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 22 11:40:15 UTC 2015 - kstreitova@suse.com
+
+- Upgrade to version 2.44.0
+  http://dmtf.org/sites/default/files/cim/cim_schema_v2440/releasenotes.html 
+- use spec-cleaner
+
 -------------------------------------------------------------------
 Thu Feb 26 07:48:36 UTC 2015 - kkaempf@suse.com
 
diff --git a/cim-schema.spec b/cim-schema.spec
index 0284f82..43d19c0 100644
--- a/cim-schema.spec
+++ b/cim-schema.spec
@@ -16,22 +16,21 @@
 #
 
 
-BuildRequires:  unzip
-
 Name:           cim-schema
-Url:            http://www.dmtf.org/
+Version:        2.44.0
+Release:        0
 Summary:        Common Information Model (CIM) Schema
 License:        SUSE-DMTF
 Group:          System/Management
-Version:        2.43.0
-Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        http://www.dmtf.org/sites/default/files/cim/cim_schema_v2430/cim_schema_%{version}Experimental-MOFs.zip
+Url:            http://www.dmtf.org/
+Source0:        http://www.dmtf.org/sites/default/files/cim/cim_schema_v2440/cim_schema_%{version}Experimental-MOFs.zip
 Source1:        loadmof.sh
 Source2:        rmmof.sh
-BuildArch:      noarch
+BuildRequires:  unzip
 # openlmi-* requires the experimental variant
 Provides:       cim-schema-experimental = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 Common Information Model (CIM) is a model for describing overall
@@ -41,45 +40,45 @@ details for integration with other management models. The schema
 provides the actual model descriptions.
 
 %prep
-%setup -c -n %{name}-%{version}
+%setup -q -c
 
 %build
 
 %install
-MOFDIR=/usr/share/mof
+MOFDIR=%{_datadir}/mof
 CIMDIR=$MOFDIR/cimv%{version}
 for i in `find . -name "*.mof"`; do
   perl -p -i -e 's/\r//g' $i
 done
-install -d $RPM_BUILD_ROOT/$CIMDIR
+install -d %{buildroot}/$CIMDIR
 perl -p -i -e 's/\\/\//g' cim*.mof
 echo "" >> qualifiers.mof
 echo "// Optional Qualifiers: " >> qualifiers.mof
 echo "" >> qualifiers.mof
 cat qualifiers_optional.mof >> qualifiers.mof
-%__rm qualifiers_optional.mof
+rm qualifiers_optional.mof
 chmod -R go-wx .
 chmod -R a+rX .
-%__mv * $RPM_BUILD_ROOT/$CIMDIR/
-ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current
-pushd $RPM_BUILD_ROOT/$CIMDIR/
+mv * %{buildroot}/$CIMDIR/
+ln -s cimv%{version} %{buildroot}/$MOFDIR/cim-current
+pushd %{buildroot}/$CIMDIR/
 ln -s cim*.mof CIM_Schema.mof
 popd
-install -d $RPM_BUILD_ROOT/usr/bin
-install -m 755 %{S:1} $RPM_BUILD_ROOT/usr/bin/ 
-install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/bin/ 
-perl -p -i -e 's~^#pragma include ("qualifiers_optional\.mof")~\/\/#pragma include ("qualifiers_optional\.mof")~g' $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
+install -d %{buildroot}%{_prefix}/bin
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/
+install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/
+perl -p -i -e 's~^#pragma include ("qualifiers_optional\.mof")~\/\/#pragma include ("qualifiers_optional\.mof")~g' %{buildroot}/$MOFDIR/cim-current/CIM_Schema.mof
 perl -p -i -e \
 	's~^#pragma include \("qualifiers_optional\.mof"\)~\/\/#pragma include ("qualifiers_optional\.mof")~g' \
-	$RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
+	%{buildroot}/$MOFDIR/cim-current/CIM_Schema.mof
 
 %files
 %defattr(-, root, root)
-%dir /usr/share/mof
-%dir /usr/share/mof/cimv%{version}
-/usr/share/mof/cimv%{version}/*
-/usr/share/mof/cim-current
-/usr/bin/loadmof.sh
-/usr/bin/rmmof.sh
+%dir %{_datadir}/mof
+%dir %{_datadir}/mof/cimv%{version}
+%{_datadir}/mof/cimv%{version}/*
+%{_datadir}/mof/cim-current
+%{_bindir}/loadmof.sh
+%{_bindir}/rmmof.sh
 
 %changelog
diff --git a/cim_schema_2.43.0Experimental-MOFs.zip b/cim_schema_2.43.0Experimental-MOFs.zip
deleted file mode 100644
index d71decc..0000000
--- a/cim_schema_2.43.0Experimental-MOFs.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d861bacaf1c88658b23cc9d713b2e437403c4b9558941e6c9f99b122582e08f8
-size 2151391
diff --git a/cim_schema_2.44.0Experimental-MOFs.zip b/cim_schema_2.44.0Experimental-MOFs.zip
new file mode 100644
index 0000000..0a697e2
--- /dev/null
+++ b/cim_schema_2.44.0Experimental-MOFs.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f24e55838b80aaa956cb20a935920434fe71c3115ec6c1ff3246f40419e492c
+size 2176407