This commit is contained in:
Caolan McNamara 2009-02-28 14:06:17 +00:00
parent 2e490320cd
commit ea20f1f35f
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,15 @@
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};

View File

@ -43,7 +43,7 @@
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
Version: 2.7.2 Version: 2.7.2
Release: 5%{?dist} Release: 6%{?dist}
Epoch: 2 Epoch: 2
# #
Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
@ -81,6 +81,7 @@ Patch9: pegasus-2.6.0-cimuser.patch
Patch11: pegasus-2.7.0-no_privilege_separation.patch Patch11: pegasus-2.7.0-no_privilege_separation.patch
Patch12: pegasus-2.7.0-no_snmp_tests.patch Patch12: pegasus-2.7.0-no_snmp_tests.patch
Patch13: pegasus-2.7.1-sparc.patch Patch13: pegasus-2.7.1-sparc.patch
Patch14: pegasus-2.7.2-baseelif.patch
# #
Conflicts: openwbem Conflicts: openwbem
Provides: tog-pegasus-cimserver Provides: tog-pegasus-cimserver
@ -149,6 +150,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%patch12 -p1 -b .no_snmp_tests %patch12 -p1 -b .no_snmp_tests
%patch5 -p1 -b .local-or-remote-auth %patch5 -p1 -b .local-or-remote-auth
%patch13 -p1 -b .sparc %patch13 -p1 -b .sparc
%patch14 -p1 -b .bareelif
find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:; find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
%build %build
@ -460,6 +462,9 @@ fi
%changelog %changelog
* Sat Feb 28 2009 Caolán McNamara <caolanm@redhat.com> - 2:2.7.2-6
- fix elif
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:2.7.2-5 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:2.7.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild