From 74101bac6df26f1b54c62d9403a6269bbdce07c44003814b1b3209bebd94454d Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 10 Sep 2010 13:25:45 +0000
Subject: [PATCH] Accepting request 47598 from Base:System

Copy from Base:System/dmidecode based on submit request 47598 from user coolo

OBS-URL: https://build.opensuse.org/request/show/47598
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dmidecode?expand=0&rev=7
---
 ...ecode-fix-makefile-for-GNU-make-3.82.patch | 18 +++++++++++++++
 dmidecode.changes                             |  6 +++++
 dmidecode.spec                                | 22 +++++--------------
 3 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 dmidecode-fix-makefile-for-GNU-make-3.82.patch

diff --git a/dmidecode-fix-makefile-for-GNU-make-3.82.patch b/dmidecode-fix-makefile-for-GNU-make-3.82.patch
new file mode 100644
index 0000000..bc6789e
--- /dev/null
+++ b/dmidecode-fix-makefile-for-GNU-make-3.82.patch
@@ -0,0 +1,18 @@
+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 398405a..f7464e5 100644
--- a/dmidecode.changes
+++ b/dmidecode.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  8 18:17:59 CEST 2010 - jdelvare@suse.de
+
+- dmidecode-fix-makefile-for-GNU-make-3.82.patch: Drop BSD make
+  command in Makefile, as GNU make 3.82 chokes on it.
+
 -------------------------------------------------------------------
 Tue May  5 10:02:31 CEST 2009 - coolo@suse.de
 
diff --git a/dmidecode.spec b/dmidecode.spec
index 2b1c425..d37ab81 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dmidecode (Version 2.10)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -21,13 +21,14 @@
 Name:           dmidecode
 Url:            http://www.nongnu.org/dmidecode/
 Version:        2.10
-Release:        3
-License:        GPL v2 or later
+Release:        10
+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
@@ -46,15 +47,9 @@ Beware that DMI data have proven to be too unreliable to be blindly
 trusted. Dmidecode does not scan your hardware, it only reports what
 the BIOS told it to.
 
-
-
-Authors:
---------
-    Alan Cox <alan@redhat.com>
-    Jean Delvare <khali@linux-fr.org>
-
 %prep
 %setup
+%patch1 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -80,10 +75,3 @@ done
 /%{_mandir}/man8/*
 
 %changelog
-* Tue May 05 2009 coolo@suse.de
-- obsolete pmtools, but do not provide it as it's not a rename
-* Wed Mar 25 2009 jdelvare@suse.de
-- Initial packaging. Historically, dmidecode had been part of the
-  pmtools package, but it didn't make that much sense so it now has
-  its own package.
-- Initial version: 2.10.