From c38aedcaf2bdf546fe2b136e53efa2a608d1ce8132fdbc4aa874cb9de7da702d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 15 May 2013 12:04:44 +0000 Subject: [PATCH 1/2] - fix GCC 4.3 build OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=15 --- ipmitool.changes | 5 +++++ ipmitool.spec | 5 +++++ old-gcc-options.patch | 12 ++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 old-gcc-options.patch diff --git a/ipmitool.changes b/ipmitool.changes index ae10163..6c42f3d 100644 --- a/ipmitool.changes +++ b/ipmitool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 15 12:04:25 UTC 2013 - kkaempf@suse.com + +- fix GCC 4.3 build + ------------------------------------------------------------------- Mon Mar 18 11:29:30 UTC 2013 - dvaleev@suse.com diff --git a/ipmitool.spec b/ipmitool.spec index e9ef256..ad2d1f7 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -39,6 +39,8 @@ Patch8: several_more_compile_fixes.patch Patch9: automake-1.13.patch #PATCH-FIX-UPSTREAM https://sourceforge.net/tracker/?func=detail&aid=3578022&group_id=95200&atid=610550 Patch10: ipmitool-bigendian.patch +#gcc 4.3 does not like -Wno-unused-result -Wno-packed-bitfield-compat, kkaempf@suse.de +Patch11: old-gcc-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +73,9 @@ and setting LAN configuration, and chassis power control. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%if 0%{?suse_version} < 1140 +%patch11 -p1 +%endif %build touch INSTALL NEWS diff --git a/old-gcc-options.patch b/old-gcc-options.patch new file mode 100644 index 0000000..22f5cd7 --- /dev/null +++ b/old-gcc-options.patch @@ -0,0 +1,12 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile ../orig-ipmitool-1.8.12/configure.in ./configure.in +--- ../orig-ipmitool-1.8.12/configure.in 2013-02-28 13:52:11.893152359 +0100 ++++ ./configure.in 2013-05-15 14:01:22.874811257 +0200 +@@ -34,7 +34,7 @@ + AC_CHECK_FUNCS([memmove memset strchr strdup strerror]) + AC_CHECK_FUNCS([getpassphrase]) + +-CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type -Wno-unused-result -Wno-packed-bitfield-compat" ++CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type" + + AM_PROG_LIBTOOL + LIBTOOL="$LIBTOOL --silent" From 0027e24087db2b0cb3bb800beb30ea674ca95a4209b547847483d862f2fb91bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 16 Jul 2013 13:40:48 +0000 Subject: [PATCH 2/2] - Run format_spec_file so it is up par with others. * Adds patch: old-gcc-options.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=16 --- ipmitool.changes | 6 ++++++ ipmitool.spec | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ipmitool.changes b/ipmitool.changes index 6c42f3d..8f9d035 100644 --- a/ipmitool.changes +++ b/ipmitool.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 16 13:36:07 UTC 2013 - tchvatal@suse.com + +- Run format_spec_file so it is up par with others. + ------------------------------------------------------------------- Wed May 15 12:04:25 UTC 2013 - kkaempf@suse.com - fix GCC 4.3 build + * Adds patch: old-gcc-options.patch ------------------------------------------------------------------- Mon Mar 18 11:29:30 UTC 2013 - dvaleev@suse.com diff --git a/ipmitool.spec b/ipmitool.spec index ad2d1f7..4f46e01 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -1,7 +1,7 @@ # # spec file for package ipmitool # -# Copyright (c) 2011 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 @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ipmitool -BuildRequires: openssl-devel readline-devel BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: readline-devel Url: http://ipmitool.sourceforge.net/ Summary: Utility for IPMI Control -Version: 1.8.12 -Release: 9 License: BSD-3-Clause Group: System/Management +Version: 1.8.12 +Release: 0 Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Patch: compile-fixes Patch1: ipmitool-1.8.10-implicit-fortify-decl.patch @@ -39,7 +38,7 @@ Patch8: several_more_compile_fixes.patch Patch9: automake-1.13.patch #PATCH-FIX-UPSTREAM https://sourceforge.net/tracker/?func=detail&aid=3578022&group_id=95200&atid=610550 Patch10: ipmitool-bigendian.patch -#gcc 4.3 does not like -Wno-unused-result -Wno-packed-bitfield-compat, kkaempf@suse.de +#PATCH-FIX-SUSE gcc 4.3 does not like -Wno-unused-result -Wno-packed-bitfield-compat, kkaempf@suse.de Patch11: old-gcc-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build