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

[vcrhonek]

commit e63a27262156c515c60b5b194cdbd863d51d85af
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Aug 8 09:27:15 2013 +0200

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

 sblim-cmpi-fsvol-1.5.1-docdir.patch          |   12 ++++++++++++
 sblim-cmpi-fsvol-1.5.1-pegasus-interop.patch |   24 ++++++++++++++++++++++++
 sblim-cmpi-fsvol.spec                        |   16 +++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-fsvol-1.5.1-docdir.patch b/sblim-cmpi-fsvol-1.5.1-docdir.patch
new file mode 100644
index 0000000..066ff17
--- /dev/null
+++ b/sblim-cmpi-fsvol-1.5.1-docdir.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-fsvol-1.5.1/Makefile.in.orig sblim-cmpi-fsvol-1.5.1/Makefile.in
+--- sblim-cmpi-fsvol-1.5.1/Makefile.in.orig	2013-08-08 08:58:33.498014617 +0200
++++ sblim-cmpi-fsvol-1.5.1/Makefile.in	2013-08-08 08:58:43.045063067 +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-fsvol-1.5.1-pegasus-interop.patch b/sblim-cmpi-fsvol-1.5.1-pegasus-interop.patch
new file mode 100644
index 0000000..e687351
--- /dev/null
+++ b/sblim-cmpi-fsvol-1.5.1-pegasus-interop.patch
@@ -0,0 +1,24 @@
+diff -up sblim-cmpi-fsvol-1.5.1/Makefile.in.orig sblim-cmpi-fsvol-1.5.1/Makefile.in
+--- sblim-cmpi-fsvol-1.5.1/Makefile.in.orig	2013-08-08 08:58:33.498014617 +0200
++++ sblim-cmpi-fsvol-1.5.1/Makefile.in	2013-08-08 08:58:43.045063067 +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 -up sblim-cmpi-fsvol-1.5.1/provider-register.sh.orig sblim-cmpi-fsvol-1.5.1/provider-register.sh
+--- sblim-cmpi-fsvol-1.5.1/provider-register.sh.orig	2013-08-08 09:21:06.027903225 +0200
++++ sblim-cmpi-fsvol-1.5.1/provider-register.sh	2013-08-08 09:21:18.439966364 +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-fsvol.spec b/sblim-cmpi-fsvol.spec
index ef94864..0840875 100644
--- a/sblim-cmpi-fsvol.spec
+++ b/sblim-cmpi-fsvol.spec
@@ -3,7 +3,7 @@
 Summary:        SBLIM fsvol instrumentation
 Name:           sblim-cmpi-fsvol
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL
 Group:          Applications/System
 URL:            http://sourceforge.net/projects/sblim/
@@ -11,6 +11,10 @@ Source0:        http://downloads.sourceforge.net/project/sblim/providers/%{name}
 Patch0:         sblim-cmpi-fsvol-1.5.0-ext4-support.patch
 # Patch1: bz921487, backported from upstream
 Patch1:         sblim-cmpi-fsvol-1.5.1-mounted-fs-shown-as-disabled.patch
+# Patch2: remove version from docdir
+Patch2:         sblim-cmpi-fsvol-1.5.1-docdir.patch
+# Patch3: use Pegasus root/interop instead of root/PG_Interop
+Patch3:         sblim-cmpi-fsvol-1.5.1-pegasus-interop.patch
 
 BuildRequires:  sblim-cmpi-base-devel sblim-cmpi-devel
 Requires:       sblim-cmpi-base cim-server
@@ -42,6 +46,8 @@ SBLIM Base Fsvol Testcase Files for SBLIM Testsuite
 %setup -q
 %patch0 -p1 -b .ext4-support
 %patch1 -p0 -b .mounted-fs-shown-as-disabled
+%patch2 -p1 -b .docdir
+%patch3 -p1 -b .pegasus-interop
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -66,6 +72,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %files
+%doc AUTHORS COPYING DEBUG README README.TEST README.tog-pegasus
 %{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
 %{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
 %{provider_dir}/libcmpiOSBase_NFSProvider.so
@@ -73,8 +80,6 @@ echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
 %{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
 %{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
 %{_datadir}/%{name}
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %files devel
@@ -182,6 +187,11 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 08 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.1-11
+- Use Pegasus root/interop instead of root/PG_Interop
+- Fix for unversioned docdir change
+  Resolves: #994078
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild