commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2019-10-08 19:58:56 Comparing /work/SRC/openSUSE:Factory/xplatproviders (Old) and /work/SRC/openSUSE:Factory/.xplatproviders.new.2352 (New) Package is "xplatproviders" Tue Oct 8 19:58:56 2019 rev:12 rq:736009 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/xplatproviders/xplatproviders.changes 2017-07-04 09:11:04.276897429 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new.2352/xplatproviders.changes 2019-10-08 19:59:07.351983262 +0200 @@ -1,0 +2,5 @@ +Tue Oct 8 06:59:41 UTC 2019 - Klaus Kämpf + +- enable drop-stropts.h-include.patch on all platforms + +--- Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.z7jeUB/_old 2019-10-08 19:59:09.323977357 +0200 +++ /var/tmp/diff_new_pack.z7jeUB/_new 2019-10-08 19:59:09.335977320 +0200 @@ -1,7 +1,7 @@ # # spec file for package xplatproviders # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -86,9 +86,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 -%if !0%{?suse_version} %patch19 -p1 -%endif %build export CFLAGS="%{optflags}"
commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2017-07-04 09:10:37 Comparing /work/SRC/openSUSE:Factory/xplatproviders (Old) and /work/SRC/openSUSE:Factory/.xplatproviders.new (New) Package is "xplatproviders" Tue Jul 4 09:10:37 2017 rev:11 rq:507717 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/xplatproviders/xplatproviders.changes 2017-02-09 11:15:02.567926953 +0100 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2017-07-04 09:11:04.276897429 +0200 @@ -1,0 +2,12 @@ +Mon Jul 3 06:57:16 UTC 2017 - kkae...@suse.com + +- add configure-assume-host-SUSE-if-SUSE_VERSION-set.patch + to detect host in absence of /etc/issue + +- add drop-stropts.h-include.patch + fixes redhat/centos/fedora builds + +- rename 0002-Consider-gcc-in-SUSE-can-handle-dynamic_cast.patch + to Consider-gcc-in-SUSE-and-REDHAT-can-handle-dynamic_c.patch + +--- Old: 0002-Consider-gcc-in-SUSE-can-handle-dynamic_cast.patch New: Consider-gcc-in-SUSE-and-REDHAT-can-handle-dynamic_c.patch configure-assume-host-SUSE-if-SUSE_VERSION-set.patch drop-stropts.h-include.patch Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.N91S6a/_old 2017-07-04 09:11:06.504584164 +0200 +++ /var/tmp/diff_new_pack.N91S6a/_new 2017-07-04 09:11:06.508583601 +0200 @@ -34,13 +34,15 @@ 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 +Patch11:Consider-gcc-in-SUSE-and-REDHAT-can-handle-dynamic_c.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 Patch17:reproducible.patch +Patch18:configure-assume-host-SUSE-if-SUSE_VERSION-set.patch +Patch19:drop-stropts.h-include.patch BuildRequires: gcc-c++ BuildRequires: sblim-cmpi-devel Requires(pre): /bin/hostname @@ -83,12 +85,20 @@ %patch15 %patch16 -p1 %patch17 -p1 +%patch18 -p1 +%if !0%{?suse_version} +%patch19 -p1 +%endif %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" %if 0%{?suse_version} -export SUSE_VERSION=0%{?suse_version} + export SUSE_VERSION=0%{?suse_version} +%else + %if 0%{?fedora_version} +export FEDORA_VERSION=0%{?fedora_version} + %endif %endif sh -x configure \ --prefix=%{_libdir}/cmpi \ ++ Consider-gcc-in-SUSE-and-REDHAT-can-handle-dynamic_c.patch ++ >From 34b770b1c6f1415a4d365678ac43a03feeb41a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 31 May 2012 17:39:19 +0200 Subject: [PATCH 5/5] Consider gcc in SUSE and REDHAT can handle dynamic_cast --- source/code/include/scxcorelib/scxcmn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/code/include/scxcorelib/scxcmn.h b/source/code/include/scxcorelib/scxcmn.h index 24a8afb76779..74abc51e1876 100644 --- a/source/code/include/scxcorelib/scxcmn.h +++ b/source/code/include/scxcorelib/scxcmn.h @@ -175,7 +175,7 @@ typedef uint64_t scxulong; /* Include scxcompat.h so it can be used without special requirements */ #include -#if !defined(sun) && !defined(aix) && !(defined(PF_DISTRO_SUSE) && PF_MAJOR==11) +#if !defined(sun) && !defined(aix) && !defined(PF_DISTRO_SUSE) && !defined(PF_DISTRO_REDHAT) // this macro disables dynamic_cast, since t causes problems on aix 5.3 - see wi 11149, 11220 #define dynamic_cast sorry_but_dynamic_cast_is_not_allowed_in_core_project_see_wi_11220 -- 2.13.1 ++ configure-assume-host-SUSE-if-SUSE_VERSION-set.patch ++ >From 40213d6b49dc48721a7b4de8a0a668f3b4267f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 3 Jul 2017 08:55:14 +0200 Subject: [PATCH] configure: assume host SUSE if SUSE_VERSION set + assume FEDORA if FEDORA_VERSION is set --- configure | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configure b/configure index c36a90eef223..fdc70edf589d 100644 --- a/configure +++ b/configure @@ -82,9 +82,16 @@ chmod +x ./build/xplatproviders/license.awk host=`./build/xplatproviders/config.guess` if [ "$host" = "Unknown" ]; then -echo "Error: unsupported platform" -echo "" -exit 1; +if [ -n "$SUSE_VERSION" ]; then + echo "SUSE" + host="SUSE" +elif [ -n "$FEDORA_VERSION" ]; then + host="FED
commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2017-02-09 11:15:01 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 2016-07-30 00:26:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2017-02-09 11:15:02.567926953 +0100 @@ -1,0 +2,5 @@ +Wed Jan 25 04:49:32 UTC 2017 - bwiedem...@suse.com + +- Add reproducible.patch to allow for reproducible builds + +--- New: reproducible.patch Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.P3lPGk/_old 2017-02-09 11:15:04.623636558 +0100 +++ /var/tmp/diff_new_pack.P3lPGk/_new 2017-02-09 11:15:04.627635993 +0100 @@ -1,7 +1,7 @@ # # spec file for package xplatproviders # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -40,6 +40,7 @@ Patch14:0001-config.guess-SuSEconfig-is-gone-post-openSUSE-12.2.patch Patch15:xplatproviders-gcc48.patch Patch16:fix-gcc6.patch +Patch17:reproducible.patch BuildRequires: gcc-c++ BuildRequires: sblim-cmpi-devel Requires(pre): /bin/hostname @@ -81,6 +82,7 @@ %patch14 -p1 %patch15 %patch16 -p1 +%patch17 -p1 %build export CFLAGS="%{optflags}" ++ reproducible.patch ++ Index: xplatproviders-1.0.0/build/xplatproviders/GNUmakefile.in === --- xplatproviders-1.0.0.orig/build/xplatproviders/GNUmakefile.in +++ xplatproviders-1.0.0/build/xplatproviders/GNUmakefile.in @@ -13,7 +13,7 @@ export SCX_BUILDVERSION_MINOR=0 export SCX_BUILDVERSION_PATCH=0 export SCX_BUILDVERSION_BUILDNR=001 export SCX_BUILDVERSION_DATE=20090426 -export SCX_BUILDVERSION_DATE=$(shell date "+%Y%m%d") +export SCX_BUILDVERSION_DATE=$(shell date --utc --date="@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" "+%Y%m%d") export SCX_BUILDVERSION_STATUS=XPlatProviders_Build VERSION="$(SCX_BUILDVERSION_MAJOR).$(SCX_BUILDVERSION_MINOR).$(SCX_BUILDVERSION_PATCH)-$(SCX_BUILDVERSION_BUILDNR)"
commit xplatproviders for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2016-07-30 00:26:40.0 +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.0 +0200 +++ /var/tmp/diff_new_pack.xY48mY/_new 2016-07-30 00:26:41.0 +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.0 +0200 +++ new/source/code/common_lib/pal/system/cpu/cpuenumeration.cpp 2016-07-23 04:47:27.697555041 +0200 @@ -622,7 +622,7 @@ SCXHandle statFile = m_deps->OpenStatFile(); wstring line; -while (g
commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2013-07-08 13:35:54 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-04-02 13:39:48.0 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2013-07-08 13:35:56.0 +0200 @@ -1,0 +2,13 @@ +Sat Jun 29 17:27:19 UTC 2013 - crrodrig...@opensuse.org + +- Also do not strip shared libraries,fix debug info generation +- Use %{?_smp_mflags} + +--- +Sat Jun 29 17:06:42 UTC 2013 - crrodrig...@opensuse.org + +- Use %optflags +- Cleanup CXXFLAGS and remove Werror so build does not + fail with gcc 4.8 (xplatproviders-gcc48.patch) + +--- New: xplatproviders-gcc48.patch Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.yGJZxq/_old 2013-07-08 13:35:56.0 +0200 +++ /var/tmp/diff_new_pack.yGJZxq/_new 2013-07-08 13:35:56.0 +0200 @@ -54,6 +54,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 @@ -81,8 +82,10 @@ %patch13 -p1 %patch14 -p1 - +%patch15 %build +export CFLAGS="%optflags" +export CXXFLAGS="%optflags" %if 0%{?suse_version} export SUSE_VERSION=%{suse_version} %endif @@ -94,7 +97,7 @@ --rundir=/var/run \ --mofdir=/usr/share/mof \ --with-cmpi-headers=/usr/include/cmpi -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install ++ xplatproviders-gcc48.patch ++ --- build/Makefile.gcc3.orig +++ build/Makefile.gcc3 @@ -64,13 +64,13 @@ DEFINES+=-DPF_DISTRO_$(PF_DISTRO) -DPF_M # Compiler flags that reglulates warning levels # Removed -pedantic (conflicts with CMPI header files). -CXX_WARN_FLAGS=-Wall -fno-nonansi-builtins -Woverloaded-virtual -Wformat -Wformat-security -Wfloat-equal -Wcast-qual -Wcast-align -Wconversion -Wswitch-enum -Wundef -Wshadow -Wwrite-strings -Wredundant-decls -Werror +CXX_WARN_FLAGS=-Wall -Woverloaded-virtual -Wformat -Wformat-security -Wfloat-equal -Wcast-qual -Wcast-align -Wconversion -Wswitch-enum -Wundef -Wshadow -Wwrite-strings -Wredundant-decls # Compiler code-generation options CXX_CGEN_FLAGS=-fPIC # Compiler Optimization flags -CXX_OPTIMIZATION_FLAGS=-fstack-protector-all +CXX_OPTIMIZATION_FLAGS= # -fstack-protector-all not supported on Sles 9 - remove ifeq ($(PF_DISTRO),SUSE) @@ -96,14 +96,14 @@ endif # CXX Debug flags for release builds ifeq ($(BUILD_TYPE),Release) - CXXFLAGS += -Os -fno-enforce-eh-specs + CXXFLAGS += endif # Avoid stack frame corruption when throwing exceptions from # callbacks by not allowing the optimizer to omit frame pointers # (implicit with the -Os option). This bug was observed with the # GCC 3.4.3 compiler on Red Hat 3.4.3-9. See WI-11657 for more. -CXXFLAGS += -fno-omit-frame-pointer +CXXFLAGS += # CXX Compiler flags, end result CXXFLAGS += $(DEFINES) $(CXX_OPTIMIZATION_FLAGS) $(CXX_WARN_FLAGS) $(CXX_CGEN_FLAGS) @@ -134,7 +134,7 @@ CIMMOF=cimmof ifeq ($(BUILD_TYPE),Debug) STRIP=$(NOOP) else - STRIP=strip + STRIP=true endif # Include paths for POSIX platforms -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2013-04-02 13:39:45 Comparing /work/SRC/openSUSE:Factory/xplatproviders (Old) and /work/SRC/openSUSE:Factory/.xplatproviders.new (New) Package is "xplatproviders", Maintainer is "" Changes: --- /work/SRC/openSUSE:Factory/xplatproviders/xplatproviders.changes 2012-10-27 07:57:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2013-04-02 13:39:48.0 +0200 @@ -1,0 +2,5 @@ +Fri Mar 22 16:29:13 UTC 2013 - dval...@suse.com + +- set ExclusiveArch to x86, as cpu_provider is x86 specific + +--- Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.Qpb4yz/_old 2013-04-02 13:39:49.0 +0200 +++ /var/tmp/diff_new_pack.Qpb4yz/_new 2013-04-02 13:39:49.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package xplatproviders # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,7 @@ Patch14:0001-config.guess-SuSEconfig-is-gone-post-openSUSE-12.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %{ix86} x86_64 %description System Center Cross Platform Solutions are open source add-ons for -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xplatproviders for openSUSE:Factory
Hello community, here is the log from the commit of package xplatproviders for openSUSE:Factory checked in at 2012-10-27 07:57:49 Comparing /work/SRC/openSUSE:Factory/xplatproviders (Old) and /work/SRC/openSUSE:Factory/.xplatproviders.new (New) Package is "xplatproviders", Maintainer is "" Changes: --- /work/SRC/openSUSE:Factory/xplatproviders/xplatproviders.changes 2012-06-01 22:33:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.xplatproviders.new/xplatproviders.changes 2012-10-27 07:57:52.0 +0200 @@ -1,0 +2,5 @@ +Fri Oct 26 12:49:31 UTC 2012 - kkae...@suse.com + +- SuSEconfig dropped, fix SUSE detection during build + +--- New: 0001-config.guess-SuSEconfig-is-gone-post-openSUSE-12.2.patch Other differences: -- ++ xplatproviders.spec ++ --- /var/tmp/diff_new_pack.sOSQJE/_old 2012-10-27 07:57:56.0 +0200 +++ /var/tmp/diff_new_pack.sOSQJE/_new 2012-10-27 07:57:56.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package xplatproviders # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xplatproviders -BuildRequires: gcc-c++ sblim-cmpi-devel +BuildRequires: gcc-c++ +BuildRequires: sblim-cmpi-devel %if 0%{?rhel_version} > 0 BuildRequires: -vim @@ -31,13 +30,13 @@ Requires(pre): sed coreutils grep /bin/hostname Version:1.0.0 -Release:1 +Release:0 # Mandriva: # Release %mkrel 1 Url:http://scx.codeplex.com/ +Summary:Operations Manager Cross Platform Providers License:MS-PL Group: System/Management -Summary:Operations Manager Cross Platform Providers Source: %{name}-%{version}.tar.gz Patch1: 0001-Recognize-openSUSE.patch Patch2: 0002-Fix-preprocessor-if-aix-if-defined-aix.patch @@ -54,6 +53,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,11 +79,13 @@ %patch12 -p1 %patch13 -p1 +%patch14 -p1 + %build %if 0%{?suse_version} export SUSE_VERSION=%{suse_version} %endif -sh configure \ +sh -x configure \ --prefix=%{_libdir}/cmpi \ --libdir=%{_libdir}/cmpi \ --confdir=%{_sysconfdir} \ ++ 0001-config.guess-SuSEconfig-is-gone-post-openSUSE-12.2.patch ++ >From 176e0e288b368589a6cbeeb577b54427cf918eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 26 Oct 2012 14:47:08 +0200 Subject: [PATCH] config.guess: SuSEconfig is gone post openSUSE-12.2 --- build/xplatproviders/config.guess |2 ++ 1 file changed, 2 insertions(+) diff --git a/build/xplatproviders/config.guess b/build/xplatproviders/config.guess index 161d5fe..065b3a3 100755 --- a/build/xplatproviders/config.guess +++ b/build/xplatproviders/config.guess @@ -190,6 +190,8 @@ then elif [ -r /etc/fedora-release ]; then GetLinuxInfo "/etc/fedora-release" # Open Build Service ?! elif [ -d /etc/SuSEconfig ]; then GetLinuxInfo "OBS" + # post-openSUSE 12.2 (SuSEconfig gone) ? + elif [ -d /etc/susehelp.d ]; then GetLinuxInfo "OBS" fi if [ "${OSAlias}" == "Unknown" ] then -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org