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

[vcrhonek]

commit d134586d5c28f41e1f42c6dade7a78d37c7f1d73
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Mon Aug 12 13:16:48 2013 +0200

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

 sblim-cmpi-params-1.3.0-docdir.patch          |   12 ++++++++++++
 sblim-cmpi-params-1.3.0-pegasus-interop.patch |   12 ++++++++++++
 sblim-cmpi-params.spec                        |   16 +++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-params-1.3.0-docdir.patch b/sblim-cmpi-params-1.3.0-docdir.patch
new file mode 100644
index 0000000..cf05eb7
--- /dev/null
+++ b/sblim-cmpi-params-1.3.0-docdir.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-params-1.3.0/Makefile.in.orig sblim-cmpi-params-1.3.0/Makefile.in
+--- sblim-cmpi-params-1.3.0/Makefile.in.orig	2013-08-12 13:01:43.865201247 +0200
++++ sblim-cmpi-params-1.3.0/Makefile.in	2013-08-12 13:01:52.703247100 +0200
+@@ -274,7 +274,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-params-1.3.0-pegasus-interop.patch b/sblim-cmpi-params-1.3.0-pegasus-interop.patch
new file mode 100644
index 0000000..14bd982
--- /dev/null
+++ b/sblim-cmpi-params-1.3.0-pegasus-interop.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-params-1.3.0/provider-register.sh.orig sblim-cmpi-params-1.3.0/provider-register.sh
+--- sblim-cmpi-params-1.3.0/provider-register.sh.orig	2013-08-12 13:08:07.909191988 +0200
++++ sblim-cmpi-params-1.3.0/provider-register.sh	2013-08-12 13:08:21.825263966 +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-params.spec b/sblim-cmpi-params.spec
index 68327d6..6d48949 100644
--- a/sblim-cmpi-params.spec
+++ b/sblim-cmpi-params.spec
@@ -2,7 +2,7 @@
 
 Name:           sblim-cmpi-params
 Version:        1.3.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        SBLIM params instrumentation
 
 Group:          Applications/System
@@ -10,6 +10,10 @@ License:        EPL
 URL:            http://sblim.wiki.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 Patch0:         sblim-cmpi-params-1.2.4-no-abi-params.patch
+# Patch1: remove version from docdir
+Patch1:         sblim-cmpi-params-1.3.0-docdir.patch
+# Patch2: use Pegasus root/interop instead of root/PG_Interop
+Patch2:         sblim-cmpi-params-1.3.0-pegasus-interop.patch
 
 BuildRequires:  sblim-cmpi-devel sblim-cmpi-base-devel
 Requires:       sblim-cmpi-base cim-server cim-schema
@@ -29,6 +33,8 @@ SBLIM Base Params Testcase Files for SBLIM Testsuite
 %prep
 %setup -q
 %patch0 -p1 -b .no-abi-params
+%patch1 -p1 -b .docdir
+%patch2 -p1 -b .pegasus-interop
 
 %build
 %configure \
@@ -44,10 +50,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{provider_dir}/*.la
 
 %files
+%doc AUTHORS COPYING DEBUG README README.TEST README.tog-pegasus
 %{provider_dir}/*.so
 %{_datadir}/%{name}
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
 
 %files test
 %{_datadir}/sblim-testsuite
@@ -151,6 +156,11 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 12 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.0-9
+- Use Pegasus root/interop instead of root/PG_Interop
+- Fix for unversioned docdir change
+  Resolves: #994082
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild