[sblim-gather] Update to sblim-gather-2.2.9, Use Pegasus root/interop instead of root/PG_Interop

vcrhonek vcrhonek at fedoraproject.org
Mon Oct 13 09:55:00 UTC 2014


commit 26ef4dd55fade9cf72d6bb31056b9f34fd0a9318
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Mon Oct 13 11:54:47 2014 +0200

    Update to sblim-gather-2.2.9, Use Pegasus root/interop instead of root/PG_Interop

 .gitignore                               |    1 +
 sblim-gather-2.2.8-format-security.patch |   59 ------------------------------
 sblim-gather-2.2.9-pegasus-interop.patch |   12 ++++++
 sblim-gather.spec                        |   20 ++++++----
 sources                                  |    2 +-
 5 files changed, 26 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 113d5a1..0a1f8eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ sblim-gather-2.2.1.tar.bz2
 /sblim-gather-2.2.7.tar.bz2
 /missing-providers.tgz
 /sblim-gather-2.2.8.tar.bz2
+/sblim-gather-2.2.9.tar.bz2
diff --git a/sblim-gather-2.2.9-pegasus-interop.patch b/sblim-gather-2.2.9-pegasus-interop.patch
new file mode 100644
index 0000000..521a137
--- /dev/null
+++ b/sblim-gather-2.2.9-pegasus-interop.patch
@@ -0,0 +1,12 @@
+diff -up sblim-gather-2.2.9/provider/provider-register.sh.orig sblim-gather-2.2.9/provider/provider-register.sh
+--- sblim-gather-2.2.9/provider/provider-register.sh.orig	2014-10-13 11:20:01.000000000 +0200
++++ sblim-gather-2.2.9/provider/provider-register.sh	2014-10-13 11:41:55.374300205 +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-gather.spec b/sblim-gather.spec
index 28fa881..fafd257 100644
--- a/sblim-gather.spec
+++ b/sblim-gather.spec
@@ -3,8 +3,8 @@
 %global tog_pegasus_version 2:2.6.1-1
 
 Name:           sblim-gather
-Version:        2.2.8
-Release:        9%{?dist}
+Version:        2.2.9
+Release:        1%{?dist}
 Summary:        SBLIM Gatherer
 
 Group:          Applications/System
@@ -31,10 +31,10 @@ Patch2:         sblim-gather-2.2.7-typos.patch
 
 # Patch3: removes version from docdir
 Patch3:         sblim-gather-2.2.8-docdir.patch
-# Patch4: fixes build fail if "-Werror=format-security" flag is used
-Patch4:         sblim-gather-2.2.8-format-security.patch
-# Patch5: fixes multilib conflicts
-Patch5:         sblim-gather-2.2.8-multilib.patch
+# Patch4: fixes multilib conflicts
+Patch4:         sblim-gather-2.2.8-multilib.patch
+# Patch5: use Pegasus root/interop instead of root/PG_Interop
+Patch5:         sblim-gather-2.2.9-pegasus-interop.patch
 
 Requires:       tog-pegasus >= %{tog_pegasus_version}
 Requires(post): systemd
@@ -92,8 +92,8 @@ tar xfvz %{SOURCE4}
 %patch1 -p1 -b .missing_providers
 %patch2 -p1 -b .typos
 %patch3 -p1 -b .docdir
-%patch4 -p1 -b .format-security
-%patch5 -p1 -b .multilib
+%patch4 -p1 -b .multilib
+%patch5 -p1 -b .pegasus-interop
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -246,6 +246,10 @@ fi
 %postun provider -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 13 2014 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.2.9-1
+- Update to sblim-gather-2.2.9
+- Use Pegasus root/interop instead of root/PG_Interop
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index e5981f3..d24023c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 895eb5351e79a7676b0ad19b37e96f59  missing-providers.tgz
-f7148a2f383d5afc749362bd60972a50  sblim-gather-2.2.8.tar.bz2
+9525751f776fe3579cd17a5d00e67f00  sblim-gather-2.2.9.tar.bz2


More information about the scm-commits mailing list