Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2016-07-30 00:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplatproviders (Old) and /work/SRC/openSUSE:Factory/.xplatproviders.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xplatproviders" Changes: -------- --- /work/SRC/openSUSE:Factory/xplatproviders/xplatproviders.changes 2013-07-08 13:35:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2016-07-30 00:26:40.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 23 02:56:10 UTC 2016 - r...@fthiessen.de + +- Added fix-gcc6.patch for gcc6 build (Tumbleweed / Factory). + * Fixes boo#985164 + +------------------------------------------------------------------- New: ---- fix-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplatproviders.spec ++++++ --- /var/tmp/diff_new_pack.xY48mY/_old 2016-07-30 00:26:41.000000000 +0200 +++ /var/tmp/diff_new_pack.xY48mY/_new 2016-07-30 00:26:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xplatproviders # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,12 @@ Name: xplatproviders -BuildRequires: gcc-c++ -BuildRequires: sblim-cmpi-devel - -%if 0%{?rhel_version} > 0 -BuildRequires: -vim -%endif - -%if 0%{?suse_version} > 1010 -BuildRequires: fdupes -%endif - -Requires(pre): sed coreutils grep /bin/hostname Version: 1.0.0 Release: 0 -# Mandriva: -# Release %mkrel 1 -Url: http://scx.codeplex.com/ Summary: Operations Manager Cross Platform Providers License: MS-PL Group: System/Management +Url: http://scx.codeplex.com/ Source: %{name}-%{version}.tar.gz Patch1: 0001-Recognize-openSUSE.patch Patch2: 0002-Fix-preprocessor-if-aix-if-defined-aix.patch @@ -47,16 +33,27 @@ Patch7: 0007-Compute-major.minor-os-version-inside-OBS.patch Patch8: 0008-untab-indentation-for.patch Patch9: 0009-Honor-DESTDIR-in-install.patch - Patch10: 0001-Get-release-string-and-version-right.patch Patch11: 0002-Consider-gcc-in-SUSE-can-handle-dynamic_cast.patch Patch12: 0003-Include-unistd.h.patch Patch13: 0004-Remove-const-qualifier-from-functions-returning-inte.patch - Patch14: 0001-config.guess-SuSEconfig-is-gone-post-openSUSE-12.2.patch Patch15: xplatproviders-gcc48.patch +Patch16: fix-gcc6.patch +BuildRequires: gcc-c++ +BuildRequires: sblim-cmpi-devel +Requires(pre): /bin/hostname +Requires(pre): coreutils +Requires(pre): grep +Requires(pre): sed BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 +%if 0%{?rhel_version} > 0 +BuildRequires: -vim +%endif +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +%endif %description System Center Cross Platform Solutions are open source add-ons for @@ -83,34 +80,33 @@ %patch14 -p1 %patch15 +%patch16 -p1 + %build -export CFLAGS="%optflags" -export CXXFLAGS="%optflags" +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" %if 0%{?suse_version} -export SUSE_VERSION=%{suse_version} +export SUSE_VERSION=0%{?suse_version} %endif sh -x configure \ --prefix=%{_libdir}/cmpi \ --libdir=%{_libdir}/cmpi \ --confdir=%{_sysconfdir} \ - --logdir=/var/log \ - --rundir=/var/run \ - --mofdir=/usr/share/mof \ - --with-cmpi-headers=/usr/include/cmpi + --logdir=%{_localstatedir}/log \ + --rundir=%{_localstatedir}/run \ + --mofdir=%{_datadir}/mof \ + --with-cmpi-headers=%{_includedir}/cmpi make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/installinfo.txt - -%clean -rm -rf $RPM_BUILD_ROOT +make %{?_smp_mflags} DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_sysconfdir}/installinfo.txt %files %defattr(-,root,root) %doc license.txt readme.txt xplatproviders.pdf %{_libdir}/cmpi -/usr/share/mof +%{_datadir}/mof %config(noreplace) %{_sysconfdir}/*.conf %changelog ++++++ fix-gcc6.patch ++++++ diff -Nur xplatproviders-1.0.0/source/code/common_lib/pal/system/cpu/cpuenumeration.cpp new/source/code/common_lib/pal/system/cpu/cpuenumeration.cpp --- xplatproviders-1.0.0/source/code/common_lib/pal/system/cpu/cpuenumeration.cpp 2009-07-09 22:00:40.000000000 +0200 +++ new/source/code/common_lib/pal/system/cpu/cpuenumeration.cpp 2016-07-23 04:47:27.697555041 +0200 @@ -622,7 +622,7 @@ SCXHandle<wistream> statFile = m_deps->OpenStatFile(); wstring line; - while (getline(*statFile, line) > 0) + while (getline(*statFile, line).good()) { vector<wstring> tokens; SCXCoreLib::SCXHandle<CPUInstance> inst(0); diff -Nur xplatproviders-1.0.0/source/code/common_lib/util/stringaid.cpp new/source/code/common_lib/util/stringaid.cpp --- xplatproviders-1.0.0/source/code/common_lib/util/stringaid.cpp 2009-07-09 22:00:41.000000000 +0200 +++ new/source/code/common_lib/util/stringaid.cpp 2016-07-23 04:48:31.457971710 +0200 @@ -347,7 +347,7 @@ unsigned int tmp; wstringstream ss(str); - bool conv_result = (ss >> tmp) != 0; + bool conv_result = !((ss >> tmp).fail()); // Note: I'm not sure which one MacOS belongs under; move it if needed // once the unit tests are running. @@ -394,7 +394,7 @@ double tmp; wstringstream ss(str); - bool conv_result = (ss >> tmp) != 0; + bool conv_result = !(ss >> tmp).fail(); if (!conv_result) { throw SCXCoreLib::SCXNotSupportedException(L"Cannot parse double in: '" + str + L"'", SCXSRCLOCATION); @@ -419,9 +419,9 @@ scxlong tmp; wstringstream ss(str); - bool conv_result = (ss >> tmp) != 0; + bool conv_result = (ss >> tmp).fail(); - if (!conv_result) { + if (conv_result) { throw SCXCoreLib::SCXNotSupportedException(L"Cannot parse scxlong in: '" + str + L"'", SCXSRCLOCATION); } return tmp; @@ -444,7 +444,7 @@ scxulong tmp; wstringstream ss(str); - bool conv_result = (ss >> tmp) != 0; + bool conv_result = !((ss >> tmp).fail()); // Note: I'm not sure which one MacOS belongs under; move it if needed // once the unit tests are running.