From 5708e64f0114d289c4cec0a220954fdf31e612366d11ba8752f19b98bd5282ab Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 20 Jan 2011 12:57:17 +0000 Subject: [PATCH] - Update to upstream version 2.11: * Adds support for SMBIOS 2.6.1 and 2.7. This includes new enumerated values for recent hardware. * Obsoletes dmidecode-fix-makefile-for-GNU-make-3.82.patch. * Various minor fixes and clean-ups. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=8 --- dmidecode-2.10.tar.bz2 | 3 --- dmidecode-2.11.tar.bz2 | 3 +++ dmidecode-fix-makefile-for-GNU-make-3.82.patch | 18 ------------------ dmidecode.changes | 9 +++++++++ dmidecode.spec | 10 ++++------ 5 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 dmidecode-2.10.tar.bz2 create mode 100644 dmidecode-2.11.tar.bz2 delete mode 100644 dmidecode-fix-makefile-for-GNU-make-3.82.patch diff --git a/dmidecode-2.10.tar.bz2 b/dmidecode-2.10.tar.bz2 deleted file mode 100644 index 31f331f..0000000 --- a/dmidecode-2.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0 -size 51904 diff --git a/dmidecode-2.11.tar.bz2 b/dmidecode-2.11.tar.bz2 new file mode 100644 index 0000000..ec12b12 --- /dev/null +++ b/dmidecode-2.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51 +size 54537 diff --git a/dmidecode-fix-makefile-for-GNU-make-3.82.patch b/dmidecode-fix-makefile-for-GNU-make-3.82.patch deleted file mode 100644 index bc6789e..0000000 --- a/dmidecode-fix-makefile-for-GNU-make-3.82.patch +++ /dev/null @@ -1,18 +0,0 @@ -Drop BSD make command, as GNU make 3.82 chokes on it. ---- - Makefile | 4 ---- - 1 file changed, 4 deletions(-) - ---- dmidecode-2.10.orig/Makefile -+++ dmidecode-2.10/Makefile -@@ -36,10 +36,6 @@ RM := rm -f - - PROGRAMS := dmidecode - PROGRAMS += $(shell test `uname -m 2>/dev/null` != ia64 && echo biosdecode ownership vpddecode) --# BSD make doesn't understand the $(shell) syntax above, it wants the != --# syntax below. GNU make ignores the line below so in the end both BSD --# make and GNU make are happy. --PROGRAMS != echo dmidecode ; test `uname -m 2>/dev/null` != ia64 && echo biosdecode ownership vpddecode - - all : $(PROGRAMS) - diff --git a/dmidecode.changes b/dmidecode.changes index f7464e5..7ed94a4 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 20 13:53:27 CET 2011 - jdelvare@suse.de + +- Update to upstream version 2.11: + * Adds support for SMBIOS 2.6.1 and 2.7. This includes new + enumerated values for recent hardware. + * Obsoletes dmidecode-fix-makefile-for-GNU-make-3.82.patch. + * Various minor fixes and clean-ups. + ------------------------------------------------------------------- Wed Sep 8 18:17:59 CEST 2010 - jdelvare@suse.de diff --git a/dmidecode.spec b/dmidecode.spec index d37ab81..d8966ac 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ # -# spec file for package dmidecode (Version 2.10) +# spec file for package dmidecode (Version 2.11) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,15 +20,14 @@ Name: dmidecode Url: http://www.nongnu.org/dmidecode/ -Version: 2.10 -Release: 10 +Version: 2.11 +Release: 1 License: GPLv2+ Group: System/Console Provides: pmtools:/usr/sbin/dmidecode AutoReqProv: on Summary: DMI table decoder Source: %{name}-%{version}.tar.bz2 -Patch1: %{name}-fix-makefile-for-GNU-make-3.82.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 Obsoletes: pmtools < 20071117 @@ -49,7 +48,6 @@ the BIOS told it to. %prep %setup -%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS"