rpms/tog-pegasus/devel pegasus-2.7.2-baseelif.patch, NONE, 1.1 tog-pegasus.spec, 1.67, 1.68

Caolan McNamara caolanm at fedoraproject.org
Sat Feb 28 14:06:48 UTC 2009


Author: caolanm

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26969

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.7.2-baseelif.patch 
Log Message:
fix elif

pegasus-2.7.2-baseelif.patch:

--- NEW FILE pegasus-2.7.2-baseelif.patch ---
diff -ru pegasus.orig/src/Pegasus/Provider/CMPI/CmpiImpl.cpp pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp
--- pegasus.orig/src/Pegasus/Provider/CMPI/CmpiImpl.cpp	2009-02-28 13:30:38.000000000 +0000
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp	2009-02-28 13:32:02.000000000 +0000
@@ -3245,9 +3245,9 @@
 //--
 //-----------------------------------------------------------
 
-#ifdef CMPI_VER_200
+#if defined(CMPI_VER_200)
  static  CMPIBroker __providerBaseBroker = {0,0,0,0,0};
-#elif CMPI_VER_100
+#elif defined(CMPI_VER_100)
  static  CMPIBroker __providerBaseBroker = {0,0,0,0};
 #else
  static CMPIBroker __providerBaseBroker = {0,0,0};


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- tog-pegasus.spec	25 Feb 2009 21:09:53 -0000	1.67
+++ tog-pegasus.spec	28 Feb 2009 14:06:17 -0000	1.68
@@ -43,7 +43,7 @@
 %define _default_patch_fuzz 2
 
 Version: 		2.7.2
-Release: 		5%{?dist}
+Release: 		6%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -81,6 +81,7 @@
 Patch11:		pegasus-2.7.0-no_privilege_separation.patch
 Patch12:		pegasus-2.7.0-no_snmp_tests.patch
 Patch13:                pegasus-2.7.1-sparc.patch
+Patch14:                pegasus-2.7.2-baseelif.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -149,6 +150,7 @@
 %patch12 -p1 -b .no_snmp_tests
 %patch5 -p1 -b .local-or-remote-auth
 %patch13 -p1 -b .sparc
+%patch14 -p1 -b .bareelif
 find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
 
 %build
@@ -460,6 +462,9 @@
 
 
 %changelog
+* Sat Feb 28 2009 Caolán McNamara <caolanm at redhat.com> - 2:2.7.2-6
+- fix elif
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.7.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list