[sblim-smis-hba] Fix registration with Pegasus, Fix path to documentation

vcrhonek vcrhonek at fedoraproject.org
Wed Nov 27 14:02:31 UTC 2013 

commit fdb566c987a78b5f948af33d99f479b71ea9abf9
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Nov 27 15:02:15 2013 +0100

    Fix registration with Pegasus, Fix path to documentation

 sblim-smis-hba-1.0.0-doc-path.patch             |   12 ++
 sblim-smis-hba-1.0.0-pegasus-registration.patch |  127 +++++++++++++++++++++++
 sblim-smis-hba.spec                             |   14 ++-
 3 files changed, 151 insertions(+), 2 deletions(-)
---
diff --git a/sblim-smis-hba-1.0.0-doc-path.patch b/sblim-smis-hba-1.0.0-doc-path.patch
new file mode 100644
index 0000000..a1c4f70
--- /dev/null
+++ b/sblim-smis-hba-1.0.0-doc-path.patch
@@ -0,0 +1,12 @@
+diff -up sblim-smis-hba-1.0.0/Makefile.am.orig sblim-smis-hba-1.0.0/Makefile.am
+--- sblim-smis-hba-1.0.0/Makefile.am.orig	2013-11-27 14:41:41.857375902 +0100
++++ sblim-smis-hba-1.0.0/Makefile.am	2013-11-27 14:41:52.976416372 +0100
+@@ -24,7 +24,7 @@ sblimincdir = $(includedir)/sblim
+ EXTRA_DIST=
+ 
+ # docdir defines where the documentation goes
+-docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir=$(datadir)/doc/$(PACKAGE)
+ 
+ # Automake instructions for documentation
+ doc_DATA=README AUTHORS COPYING 
diff --git a/sblim-smis-hba-1.0.0-pegasus-registration.patch b/sblim-smis-hba-1.0.0-pegasus-registration.patch
new file mode 100644
index 0000000..4bef535
--- /dev/null
+++ b/sblim-smis-hba-1.0.0-pegasus-registration.patch
@@ -0,0 +1,127 @@
+? .cproject
+? .deps
+? .libs
+? .project
+? Linux_BaseBoard.lo
+? Linux_Common.lo
+? Linux_CommonHBA.lo
+? Linux_ComputerSystem.lo
+? Makefile
+? Makefile.in
+? aclocal.m4
+? autom4te.cache
+? cmpiLinux_Common.lo
+? cmpiLinux_ElementConformsToProfileProvider.lo
+? cmpiOSBase_ComputerSystem.lo
+? cmpiOSBase_ComputerSystemProvider.lo
+? cmpiSMIS_FCCard.lo
+? cmpiSMIS_FCCardProvider.lo
+? cmpiSMIS_FCControlledByProvider.lo
+? cmpiSMIS_FCDeviceSAPImplementationProvider.lo
+? cmpiSMIS_FCElementSoftwareIdentityProvider.lo
+? cmpiSMIS_FCElementStatisticalDataProvider.lo
+? cmpiSMIS_FCHostedAccessPointProvider.lo
+? cmpiSMIS_FCInstalledSoftwareIdentityProvider.lo
+? cmpiSMIS_FCLogicalDisk.lo
+? cmpiSMIS_FCLogicalDiskProvider.lo
+? cmpiSMIS_FCPort.lo
+? cmpiSMIS_FCPortController.lo
+? cmpiSMIS_FCPortControllerProvider.lo
+? cmpiSMIS_FCPortProvider.lo
+? cmpiSMIS_FCPortStatistics.lo
+? cmpiSMIS_FCPortStatisticsProvider.lo
+? cmpiSMIS_FCProduct.lo
+? cmpiSMIS_FCProductPhysicalComponentProvider.lo
+? cmpiSMIS_FCProductProvider.lo
+? cmpiSMIS_FCRealizesProvider.lo
+? cmpiSMIS_FCSCSIInitiatorTargetLogicalUnitPathProvider.lo
+? cmpiSMIS_FCSCSIProtocolEndpoint.lo
+? cmpiSMIS_FCSCSIProtocolEndpointProvider.lo
+? cmpiSMIS_FCSoftwareIdentity.lo
+? cmpiSMIS_FCSoftwareIdentityProvider.lo
+? cmpiSMIS_FCSoftwareIdentity_Driver.lo
+? cmpiSMIS_FCSoftwareIdentity_DriverProvider.lo
+? cmpiSMIS_FCSoftwareIdentity_Firmware.lo
+? cmpiSMIS_FCSoftwareIdentity_FirmwareProvider.lo
+? cmpiSMIS_FCSystemDeviceProvider.lo
+? cmpiSMIS_FCSystemDevice_LogicalDeviceProvider.lo
+? config.h
+? config.h.in
+? config.log
+? config.status
+? configure
+? libcmpiLinux_Common.la
+? libcmpiLinux_ECTP_Provider.la
+? libcmpiSMIS_HBA_HDR_Provider.la
+? libtool
+? sblim-smis-hba.spec
+? stamp-h1
+Index: provider-register.sh
+===================================================================
+RCS file: /cvsroot/sblim/smis-hba/provider-register.sh,v
+retrieving revision 1.1.1.1
+diff -a -u -p -U4 -r1.1.1.1 provider-register.sh
+--- provider-register.sh	12 May 2009 21:46:32 -0000	1.1.1.1
++++ provider-register.sh	9 Jul 2013 15:00:24 -0000
+@@ -49,15 +49,15 @@ pegasus_transform()
+ {
+     OUTFILE=$1
+     shift
+     regfiles=$*
+-    PROVIDERMODULES=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 4 | sort | uniq`
++    PROVIDERMODULES=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 4 | sort | uniq`
+     if test x"$PROVIDERMODULES" = x
+     then
+ 	echo Failed to read registration files >&2
+ 	return 1
+     fi
+-    PROVIDERS=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 3-4 | sort | uniq`
++    PROVIDERS=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 3-4 | sort | uniq`
+     
+ # produce ProviderModules
+     echo > $OUTFILE
+     chatter "Processing provider modules:" $PROVIDERMODULES
+@@ -95,9 +95,9 @@ EOFP
+ #produce Capabilities
+     let serial=0
+     for rf in $regfiles
+     do
+-      cat $rf | grep -v '^[[:space:]]*#.*' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
++      cat $rf | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
+       do
+ 	let serial=serial+1
+ 	numcap=
+ 	for cap in $CAPS
+@@ -244,9 +244,9 @@ pegasus_uninstall()
+     done
+   
+     if ps -C cimserver > /dev/null 2>&1 
+     then
+-	PROVIDERMODULES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 4 | sort | uniq`
++	PROVIDERMODULES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 4 | sort | uniq`
+ 	if test x"$PROVIDERMODULES" = x
+ 	    then
+ 	    echo Failed to read registration files >&2
+ 	    return 1
+@@ -268,9 +268,9 @@ pegasus_uninstall()
+         then
+ 	    echo "Error: wbemexec not found" >&2
+ 	    return 1
+ 	fi
+-	CLASSES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 1 | grep -v '^CIM_'`
++	CLASSES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 1 | grep -v '^CIM_'`
+ 	for cls in $CLASSES
+ 	do
+ 	  chatter Delete CIM Class $cls
+ 	  $WBEMEXEC > /dev/null <<EOFWX
+@@ -306,9 +306,9 @@ sfcb_transform()
+ 
+ #produce sfcb registraion
+     for rf in $regfiles
+     do
+-      cat $rf | grep -v '^[[:space:]]*#.*' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
++      cat $rf | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
+       do
+ 	chatter "Registering class" $CLASSNAME
+ 	cat >> $OUTFILE <<EOFC
+ [$CLASSNAME]   
diff --git a/sblim-smis-hba.spec b/sblim-smis-hba.spec
index b79cab7..4ca47eb 100644
--- a/sblim-smis-hba.spec
+++ b/sblim-smis-hba.spec
@@ -3,7 +3,7 @@
 
 Name:           sblim-smis-hba
 Version:        1.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        SBLIM SMIS HBA HDR Providers
 
 Group:          Applications/System
@@ -15,6 +15,10 @@ Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz
 Patch0:         sblim-smis-hba-1.0.0-no-testsuite.patch
 Patch1:         sblim-smis-hba-1.0.0-include.patch
 Patch2:         sblim-smis-hba-1.0.0-registration-fix.patch
+# Patch3: upstream
+Patch3:         sblim-smis-hba-1.0.0-pegasus-registration.patch
+# Patch4: fix documentation path
+Patch4:         sblim-smis-hba-1.0.0-doc-path.patch
 
 BuildRequires:  sblim-cmpi-devel, sblim-cmpi-base-devel
 BuildRequires:  libhbaapi-devel
@@ -36,7 +40,9 @@ SMI-S standards based HBA CMPI Providers.
 %patch0 -p1 -b .no-testsuite
 %patch1 -p2 -b .include
 %patch2 -p1 -b .registration-fix
-autoreconf
+%patch3 -p0 -b .pegasus-registration
+%patch4 -p1 -b .doc-path
+autoreconf -i
 # ltmain.sh is old, create new one
 rm -f ltmain.sh
 libtoolize --force
@@ -103,6 +109,10 @@ fi
 
 
 %changelog
+* Wed Nov 27 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.0-10
+- Fix registration with Pegasus
+- Fix path to documentation
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

More information about the scm-commits mailing list