[sblim-cmpi-base] Use Pegasus root/interop instead of root/PG_Interop, Fix unversioned docdir change

[vcrhonek]

commit 5da9eb9f930a5b9199484cbe56f78d8a8957f54e
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Aug 7 18:08:21 2013 +0200

    Use Pegasus root/interop instead of root/PG_Interop, Fix unversioned docdir change

 sblim-cmpi-base-1.6.2-docdir.patch          |   12 ++++++++++++
 sblim-cmpi-base-1.6.2-pegasus-interop.patch |   12 ++++++++++++
 sblim-cmpi-base.spec                        |   16 +++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-base-1.6.2-docdir.patch b/sblim-cmpi-base-1.6.2-docdir.patch
new file mode 100644
index 0000000..aaefe72
--- /dev/null
+++ b/sblim-cmpi-base-1.6.2-docdir.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-base-1.6.2/Makefile.in.orig sblim-cmpi-base-1.6.2/Makefile.in
+--- sblim-cmpi-base-1.6.2/Makefile.in.orig	2013-08-07 17:24:23.824822914 +0200
++++ sblim-cmpi-base-1.6.2/Makefile.in	2013-08-07 17:24:50.512965552 +0200
+@@ -370,7 +370,7 @@ datadir = @datadir@
+ datarootdir = @datarootdir@
+ 
+ # docdir defines where the documentation goes
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/sblim-cmpi-base-1.6.2-pegasus-interop.patch b/sblim-cmpi-base-1.6.2-pegasus-interop.patch
new file mode 100644
index 0000000..fda695c
--- /dev/null
+++ b/sblim-cmpi-base-1.6.2-pegasus-interop.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-base-1.6.2/provider-register.sh.orig sblim-cmpi-base-1.6.2/provider-register.sh
+--- sblim-cmpi-base-1.6.2/provider-register.sh.orig	2013-08-07 18:02:52.438321970 +0200
++++ sblim-cmpi-base-1.6.2/provider-register.sh	2013-08-07 18:04:06.087746426 +0200
+@@ -216,7 +216,7 @@ pegasus_install()
+     then
+ 	chatter Registering providers with $state cimserver
+ 	$CIMMOF -uc -I $mofpath -n $namespace $mymofs &&
+-	$CIMMOF -uc -n root/PG_Interop $_REGFILENAME
++	$CIMMOF -uc -n root/interop $_REGFILENAME
+     else
+ 	echo "Failed to build pegasus registration MOF." >&2
+ 	return 1
diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec
index 53a3249..d91e495 100644
--- a/sblim-cmpi-base.spec
+++ b/sblim-cmpi-base.spec
@@ -1,6 +1,6 @@
 Name:           sblim-cmpi-base
 Version:        1.6.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SBLIM CMPI Base Providers
 
 Group:          Applications/System
@@ -15,6 +15,10 @@ Patch3:         sblim-cmpi-base-1.6.1-double-fclose.patch
 Patch4:         sblim-cmpi-base-1.6.2-max-cpu-frequency.patch
 # Patch5: already upstream, http://sourceforge.net/p/sblim/bugs/2644/
 Patch5:         sblim-cmpi-base-1.6.2-wrong-UserModeTime-and-KernelModeTime.patch
+# Patch6: removes version from docdir
+Patch6:         sblim-cmpi-base-1.6.2-docdir.patch
+# Patch7: use Pegasus root/interop instead of root/PG_Interop
+Patch7:         sblim-cmpi-base-1.6.2-pegasus-interop.patch
 Requires:       cim-server sblim-indication_helper
 BuildRequires:  sblim-cmpi-devel sblim-indication_helper-devel
 
@@ -53,6 +57,8 @@ Testcase Files for the SBLIM Testsuite.
 %patch3 -p1 -b .double-fclose
 %patch4 -p1 -b .cpu-freq
 %patch5 -p1 -b .wrong-UserModeTime-and-KernelModeTime
+%patch6 -p1 -b .docdir
+%patch7 -p1 -b .pegasus-interop
 
 %build
 %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
@@ -69,8 +75,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 
 %files
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
+%doc AUTHORS COPYING DEBUG README README.INDICATION README.TEST README.tog-pegasus
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
 %{_libdir}/cmpi/*.so*
@@ -182,6 +187,11 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 07 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.2-7
+- Use Pegasus root/interop instead of root/PG_Interop
+- Fix unversioned docdir change
+  Resolves: #994073
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild