From bb4e55a90d25c6dfdc6a70f0959d335f04d73143 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 31 Mar 2013 15:40:32 +0100 Subject: [PATCH] Update to upstream version 2.12.1 --- .gitignore | 20 ++------------------ pegasus-2.12.0-cmpi-trace.patch | 12 ------------ sources | 2 +- tog-pegasus.spec | 33 ++++++++++++++------------------- 4 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 pegasus-2.12.0-cmpi-trace.patch diff --git a/.gitignore b/.gitignore index fa0eaa6..09bc7d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,2 @@ -tog-pegasus-2.4.1.Beta-1.tar.gz -pegasus-2.5.tar.gz -pegasus-2.5.1.tar.gz -pegasus-2.5.2.tar.gz -pegasus-2.6.0.tar.gz -pegasus-2.6.0-cmpi-provider-lib.patch -pegasus-2.6.0-local-or-remote-auth.patch -pegasus-2.6.0-no-rpath.patch -pegasus-2.7.0.tar.gz -pegasus-2.7.1.tar.gz -pegasus-2.7.2.tar.gz -pegasus-2.9.0.tar.gz -/pegasus-2.9.2.tar.gz -/pegasus-2.10.0.tar.gz -/pegasus-2.11.0.tar.gz -/pegasus-2.11.1.tar.gz -/pegasus-2.12.0.tar.gz -/cim_schema_2.33.0Experimental-MOFs.zip +/pegasus-2.*.tar.gz +/cim_schema_*.zip diff --git a/pegasus-2.12.0-cmpi-trace.patch b/pegasus-2.12.0-cmpi-trace.patch deleted file mode 100644 index 9a96ceb..0000000 --- a/pegasus-2.12.0-cmpi-trace.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp.orig pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp.orig 2012-12-06 08:33:48.569775902 +0100 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp 2012-12-06 08:34:26.285877678 +0100 -@@ -1343,7 +1343,7 @@ extern "C" - { - case CMPI_DEV_DEBUG: - logSeverity = Logger::TRACE; -- logFileType = Logger::TRACE_LOG; -+ logFileType = Logger::STANDARD_LOG; - break; - case CMPI_SEV_INFO: - logSeverity = Logger::INFORMATION; diff --git a/sources b/sources index 27adafe..3b56a8f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -144d8d9f1a73405a31b7204bfe5bbb58 pegasus-2.12.0.tar.gz +a02d07fadc899cacafaf25b9de5cca31 pegasus-2.12.1.tar.gz 854bc4694349b3eadeda040985880640 cim_schema_2.33.0Experimental-MOFs.zip diff --git a/tog-pegasus.spec b/tog-pegasus.spec index 00885d1..bbc5822 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -7,8 +7,8 @@ %global pegasus_uid 66 Name: tog-pegasus -Version: %{major_ver}.0 -Release: 16%{?dist} +Version: %{major_ver}.1 +Release: 1%{?dist} Epoch: 2 Summary: OpenPegasus WBEM Services for Linux @@ -72,16 +72,12 @@ Patch21: pegasus-2.11.1-disable-privilege-separation.patch Patch22: pegasus-2.12.0-null_value.patch # 23: Enables Interop Provider - necessary to e. g. register CMPI providers Patch23: pegasus-2.12.0-enable_interop_provider.patch -# 24: http://bugzilla.openpegasus.org/show_bug.cgi?id=9484 -# Fixes tracing for CMPI messages with CMPI_DEV_DEBUG severity -# -Patch24: pegasus-2.12.0-cmpi-trace.patch -# 25: bz#883030, getPropertyAt() returns Null instead of empty array -Patch25: pegasus-2.12.0-empty_arrays.patch -# 26: allow experimental schema registration with cimmofl during build -Patch26: pegasus-2.12.0-cimmofl-allow-experimental.patch -# 27: use external schema and add missing includes there -Patch27: pegasus-2.12.0-schema-version-and-includes.patch +# 24: bz#883030, getPropertyAt() returns Null instead of empty array +Patch24: pegasus-2.12.0-empty_arrays.patch +# 25: allow experimental schema registration with cimmofl during build +Patch25: pegasus-2.12.0-cimmofl-allow-experimental.patch +# 26: use external schema and add missing includes there +Patch26: pegasus-2.12.0-schema-version-and-includes.patch BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++ BuildRequires: libstdc++, make, pam-devel @@ -192,9 +188,6 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. %prep %setup -q -n %{srcname} -# upstream tarball has wrong structure - pegasus/pegasus/ -cp -pR pegasus/* . -rm -rf pegasus/ # convert DMTF schema for Pegasus export PEGASUS_ROOT=%PEGASUS_RPM_ROOT yes | mak/CreateDmtfSchema 233 %{SOURCE9} cim_schema_2.33.0 @@ -213,10 +206,9 @@ yes | mak/CreateDmtfSchema 233 %{SOURCE9} cim_schema_2.33.0 %patch21 -p1 -b .disable-privilege-separation %patch22 -p1 -b .null_value %patch23 -p1 -b .enable_interop_provider -%patch24 -p1 -b .cmpi-trace -%patch25 -p1 -b .empty_arrays -%patch26 -p1 -b .cimmofl-allow-experimental -%patch27 -p1 -b .schema-version-and-includes +%patch24 -p1 -b .empty_arrays +%patch25 -p1 -b .cimmofl-allow-experimental +%patch26 -p1 -b .schema-version-and-includes %build @@ -483,6 +475,9 @@ fi %changelog +* Sun Mar 31 2013 Peter Robinson 2:2.12.1-1 +- Update to upstream version 2.12.1 + * Mon Mar 18 2013 Jon Ciesla - 2:2.12.0-16 - Fix dates in changelog, BZ 922770.