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

[vcrhonek]

commit 576251da7e939c891c44fd953bdaeddb676947dc
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Aug 8 14:29:22 2013 +0200

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

 sblim-cmpi-nfsv4-1.1.0-docdir.patch          |   12 ++++++++++++
 sblim-cmpi-nfsv4-1.1.0-pegasus-interop.patch |   12 ++++++++++++
 sblim-cmpi-nfsv4.spec                        |   17 ++++++++++++++---
 3 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-nfsv4-1.1.0-docdir.patch b/sblim-cmpi-nfsv4-1.1.0-docdir.patch
new file mode 100644
index 0000000..ac63297
--- /dev/null
+++ b/sblim-cmpi-nfsv4-1.1.0-docdir.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-nfsv4-1.1.0/Makefile.in.orig sblim-cmpi-nfsv4-1.1.0/Makefile.in
+--- sblim-cmpi-nfsv4-1.1.0/Makefile.in.orig	2013-08-08 14:08:46.083524728 +0200
++++ sblim-cmpi-nfsv4-1.1.0/Makefile.in	2013-08-08 14:08:57.015582242 +0200
+@@ -284,7 +284,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-nfsv4-1.1.0-pegasus-interop.patch b/sblim-cmpi-nfsv4-1.1.0-pegasus-interop.patch
new file mode 100644
index 0000000..a2bb105
--- /dev/null
+++ b/sblim-cmpi-nfsv4-1.1.0-pegasus-interop.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-nfsv4-1.1.0/provider-register.sh.orig sblim-cmpi-nfsv4-1.1.0/provider-register.sh
+--- sblim-cmpi-nfsv4-1.1.0/provider-register.sh.orig	2013-08-08 14:14:54.635453999 +0200
++++ sblim-cmpi-nfsv4-1.1.0/provider-register.sh	2013-08-08 14:15:08.539526596 +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-nfsv4.spec b/sblim-cmpi-nfsv4.spec
index e7543ed..5d8d55f 100644
--- a/sblim-cmpi-nfsv4.spec
+++ b/sblim-cmpi-nfsv4.spec
@@ -3,12 +3,17 @@
 Name:           sblim-cmpi-nfsv4
 Summary:        SBLIM nfsv4 instrumentation
 Version:        1.1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Applications/System
 URL:            http://sourceforge.net/projects/sblim/
 Source0:        http://downloads.sourceforge.net/project/sblim/providers/%{name}/%{version}/%{name}-%{version}.tar.bz2
 
+# Patch0: remove version from docdir
+Patch0:         sblim-cmpi-nfsv4-1.1.0-docdir.patch
+# Patch1: use Pegasus root/interop instead of root/PG_Interop
+Patch1:         sblim-cmpi-nfsv4-1.1.0-pegasus-interop.patch
+
 BuildRequires:  sblim-cmpi-base-devel sblim-cmpi-devel
 Requires:       sblim-cmpi-base cim-server cim-schema
 Requires:       /etc/ld.so.conf.d
@@ -38,6 +43,8 @@ SBLIM Base Fsvol Testcase Files for SBLIM Testsuite
 
 %prep
 %setup -q
+%patch0 -p1 -b .docdir
+%patch1 -p1 -b .pegasus-interop
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -64,11 +71,10 @@ echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
 mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv4SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{provider_dir}
 
 %files
+%doc AUTHORS COPYING DEBUG README README.TEST README.tog-pegasus
 %dir %{provider_dir}
 %{provider_dir}/*.so
 %{_datadir}/%{name}
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %files test
@@ -112,6 +118,11 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 08 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.0-9
+- Use Pegasus root/interop instead of root/PG_Interop
+- Fix for unversioned docdir change
+  Resolves: #994081
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild