From 814092ddfbc058eb60103e82cb7f21127ebb6d7011d4ca09ade82db8dfb938b3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 11 Mar 2015 08:57:39 +0000 Subject: [PATCH] Accepting request 289862 from OFED:Factory 1 OBS-URL: https://build.opensuse.org/request/show/289862 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=3 --- mstflint-3.6.0-1.8.g7d4dede.tar.gz | 3 --- mstflint-4.0.0-1.30.g00eb005.tar.gz | 3 +++ mstflint-autotools.patch | 21 +++++++-------------- mstflint.changes | 8 ++++++++ mstflint.spec | 10 +++++----- 5 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 mstflint-3.6.0-1.8.g7d4dede.tar.gz create mode 100644 mstflint-4.0.0-1.30.g00eb005.tar.gz diff --git a/mstflint-3.6.0-1.8.g7d4dede.tar.gz b/mstflint-3.6.0-1.8.g7d4dede.tar.gz deleted file mode 100644 index 9da2ef6..0000000 --- a/mstflint-3.6.0-1.8.g7d4dede.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3c007bc950a05507f2bbbe4669a98f87478bc51c9d722a58fc163a4d8d55e2e -size 1009956 diff --git a/mstflint-4.0.0-1.30.g00eb005.tar.gz b/mstflint-4.0.0-1.30.g00eb005.tar.gz new file mode 100644 index 0000000..220af76 --- /dev/null +++ b/mstflint-4.0.0-1.30.g00eb005.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a031ca5645e10b6137f9c027371ecabe53c53c6d1797ae57a2cefc247d7baa45 +size 1158577 diff --git a/mstflint-autotools.patch b/mstflint-autotools.patch index b79cb3b..581b96b 100644 --- a/mstflint-autotools.patch +++ b/mstflint-autotools.patch @@ -6,19 +6,11 @@ Index: configure.ac =================================================================== --- configure.ac.orig 2014-05-14 04:09:28.079178181 +0200 +++ configure.ac 2014-05-14 04:13:35.515332301 +0200 -@@ -1,6 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. - --AC_INIT(mstflint, 3.6.0, orenk@mellanox.co.il) -+AC_INIT([mstflint], [3.6.0], [orenk@mellanox.co.il]) - - AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.]) - AC_SUBST([PROJECT]) -@@ -10,13 +10,13 @@ AC_SUBST([VERSION]) +@@ -10,13 +10,13 @@ AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([README]) --AM_INIT_AUTOMAKE(mstflint, 3.6.0) +-AM_INIT_AUTOMAKE(mstflint, 4.0.0) +AM_INIT_AUTOMAKE([-Wall foreign]) dnl Checks for programs @@ -31,9 +23,9 @@ Index: configure.ac +AC_PROG_LIBTOOL() +AC_CONFIG_HEADERS([config.h]) - AC_MSG_CHECKING(--enable-dc argument) - AC_ARG_ENABLE(dc, -@@ -47,9 +47,23 @@ AM_CONDITIONAL(ENABLE_INBAND, [test "x$ + dnl Checks for headers + AC_CHECK_HEADER(termios.h,[CXXFLAGS="${CXXFLAGS} -DHAVE_TERMIOS_H"]) +@@ -50,9 +50,24 @@ CFLAGS="$CFLAGS -Werror -DMST_UL" CXXFLAGS="$CXXFLAGS -Werror -DMST_UL" @@ -45,6 +37,7 @@ Index: configure.ac + dev_mgt/Makefile \ + tools_layouts/Makefile \ + reg_access/Makefile \ ++ cmdif/Makefile \ + mlxconfig/Makefile \ + mflash/Makefile \ + mlxfwops/Makefile \ @@ -56,7 +49,7 @@ Index: configure.ac + mstdump/crd_main/Makefile \ + mstdump/mstdump_dbs/Makefile ) --AC_OUTPUT( Makefile mft_utils/Makefile mtcr_ul/Makefile dev_mgt/Makefile tools_layouts/Makefile reg_access/Makefile mlxconfig/Makefile \ +-AC_OUTPUT( Makefile mft_utils/Makefile mtcr_ul/Makefile dev_mgt/Makefile tools_layouts/Makefile reg_access/Makefile cmdif/Makefile mlxconfig/Makefile \ - mflash/Makefile mlxfwops/Makefile mlxfwops/lib/Makefile cmdparser/Makefile flint/Makefile \ - small_utils/Makefile mstdump/Makefile mstdump/crd_lib/Makefile mstdump/crd_main/Makefile mstdump/mstdump_dbs/Makefile ) +AC_OUTPUT() diff --git a/mstflint.changes b/mstflint.changes index 842fd0a..c793b75 100644 --- a/mstflint.changes +++ b/mstflint.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Mar 8 10:46:01 UTC 2015 - p.drouand@gmail.com + +- Update to version 4.0.0 + * No changelog available +- Use download Url as source +- Update mstflint-autotools.patch + ------------------------------------------------------------------- Fri Aug 8 19:27:26 CEST 2014 - pth@suse.de diff --git a/mstflint.spec b/mstflint.spec index 9f4984a..570297c 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,7 +1,7 @@ # # spec file for package mstflint # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define extra_version -1.8.g7d4dede +%define extra_version -1.30.g00eb005 Name: mstflint Summary: Mellanox Firmware Burning and Diagnostics Tools License: GPL-2.0 or BSD-2-Clause Group: System/Console -Version: 3.6.0 +Version: 4.0.0 Release: 0 -Source0: %{name}-%{version}%{extra_version}.tar.gz +Source0: https://www.openfabrics.org/downloads/mstflint/%{name}-%{version}%{extra_version}.tar.gz # PATCH-FIX-UPSTREAM Declare package as foreign and other autotools stuff pth@suse.de Patch0: mstflint-autotools.patch # PATCH-FIX-UPSTREAM Add all needed defines to get it built on s390x @@ -67,7 +67,7 @@ make CFLAGS="%{optflags} -I. -fno-exceptions" %install make DESTDIR=%{buildroot} install -rm -ff %{buildroot}%{_includedir}/mtcr_ul/mtcr.h +rm -f %{buildroot}%{_includedir}/mtcr_ul/mtcr.h rm -f %{buildroot}%{_libdir}/libmtcr_ul.a #%%post -p /sbin/ldconfig