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

[vcrhonek]

commit 6745a084d5df2d178c39b81fdb96093f8de6b8c8
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Mon Aug 12 13:57:24 2013 +0200

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

 sblim-cmpi-sysfs-1.2.0-docdir.patch          |   12 ++++++++++++
 sblim-cmpi-sysfs-1.2.0-pegasus-interop.patch |   12 ++++++++++++
 sblim-cmpi-sysfs.spec                        |   16 +++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-sysfs-1.2.0-docdir.patch b/sblim-cmpi-sysfs-1.2.0-docdir.patch
new file mode 100644
index 0000000..87a889e
--- /dev/null
+++ b/sblim-cmpi-sysfs-1.2.0-docdir.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-sysfs-1.2.0/Makefile.in.orig sblim-cmpi-sysfs-1.2.0/Makefile.in
+--- sblim-cmpi-sysfs-1.2.0/Makefile.in.orig	2013-08-12 13:30:14.722015901 +0200
++++ sblim-cmpi-sysfs-1.2.0/Makefile.in	2013-08-12 13:30:24.890068088 +0200
+@@ -390,7 +390,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-sysfs-1.2.0-pegasus-interop.patch b/sblim-cmpi-sysfs-1.2.0-pegasus-interop.patch
new file mode 100644
index 0000000..f95c577
--- /dev/null
+++ b/sblim-cmpi-sysfs-1.2.0-pegasus-interop.patch
@@ -0,0 +1,12 @@
+diff -up sblim-cmpi-sysfs-1.2.0/provider-register.sh.orig sblim-cmpi-sysfs-1.2.0/provider-register.sh
+--- sblim-cmpi-sysfs-1.2.0/provider-register.sh.orig	2013-08-12 13:31:00.938253054 +0200
++++ sblim-cmpi-sysfs-1.2.0/provider-register.sh	2013-08-12 13:31:10.905304210 +0200
+@@ -213,7 +213,7 @@ pegasus_install()
+     then
+ 	chatter Registering providers with $state cimserver
+ 	$CIMMOF -uc -I $mofpath -n root/cimv2 $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-sysfs.spec b/sblim-cmpi-sysfs.spec
index 85a0469..e88f536 100644
--- a/sblim-cmpi-sysfs.spec
+++ b/sblim-cmpi-sysfs.spec
@@ -2,7 +2,7 @@
 
 Name:           sblim-cmpi-sysfs
 Version:        1.2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        SBLIM sysfs instrumentation
 
 Group:          Applications/System
@@ -16,6 +16,10 @@ Patch0:         sblim-cmpi-sysfs-1.2.0-provider-segfault.patch
 # Patch1: issue reported upstream, patch not accepted yet,
 #         see http://sourceforge.net/tracker/index.php?func=detail&aid=2818223&group_id=128809&atid=712784
 Patch1:         sblim-cmpi-sysfs-1.2.0-sysfs-links.patch
+# Patch2: remove version from docdir
+Patch2:         sblim-cmpi-sysfs-1.2.0-docdir.patch
+# Patch3: use Pegasus root/interop instead of root/PG_Interop
+Patch3:         sblim-cmpi-sysfs-1.2.0-pegasus-interop.patch
 
 BuildRequires:  sblim-cmpi-devel sblim-cmpi-base-devel
 Requires:       sblim-cmpi-base cim-server
@@ -36,6 +40,8 @@ SBLIM Base Params Testcase Files for SBLIM Testsuite
 %setup -q
 %patch0 -p1 -b .provider-segfault
 %patch1 -p1 -b .sysfs-links
+%patch2 -p1 -b .docdir
+%patch3 -p1 -b .pegasus-interop
 sed -ri 's,-type d -maxdepth 1 -mindepth 1,-maxdepth 1 -mindepth 1 -type d,g' \
         ./test/system/linux/*.{sh,system}
 
@@ -68,11 +74,10 @@ mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_SysfsDeviceUtil.so $RPM_BUILD_ROOT/%{prov
 
 
 %files
+%doc AUTHORS COPYING DEBUG README README.TEST README.tog-pegasus sysfs.txt
 %dir %{provider_dir}
 %{provider_dir}/libLinux_Sysfs*
 %{_datadir}/sblim-cmpi-sysfs
-%docdir %{_datadir}/doc/sblim-cmpi-sysfs-%{version}
-%{_datadir}/doc/sblim-cmpi-sysfs-%{version}
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 
@@ -176,6 +181,11 @@ fi
 
 
 %changelog
+* Mon Aug 12 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.0-9
+- Use Pegasus root/interop instead of root/PG_Interop
+- Fix for unversioned docdir change
+  Resolves: #994084
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild