[dmidecode] * Fri Oct 15 2010 Anton Arapov <aarapov at redhat.com> - 1:2.1.0-2 - Does not build with gnu make v3.82

[Anton Arapov]

commit 8e4de9a98f99727542bea16ecf9599d08d46f83d
Author: Anton Arapov <anton at redhat.com>
Date:   Fri Oct 15 12:32:00 2010 +0200

    * Fri Oct 15 2010 Anton Arapov <aarapov at redhat.com> - 1:2.1.0-2
    - Does not build with gnu make v3.82+ (#631407)

 dmidecode-makefile-fix.patch |   12 ++++++++++++
 dmidecode.spec               |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/dmidecode-makefile-fix.patch b/dmidecode-makefile-fix.patch
new file mode 100644
index 0000000..78511f8
--- /dev/null
+++ b/dmidecode-makefile-fix.patch
@@ -0,0 +1,12 @@
+diff -urpN dmidecode-2.10.orig/Makefile dmidecode-2.10/Makefile
+--- dmidecode-2.10.orig/Makefile	2010-10-15 12:20:39.315427049 +0200
++++ dmidecode-2.10/Makefile	2010-10-15 12:20:48.290424691 +0200
+@@ -39,7 +39,7 @@ PROGRAMS += $(shell test `uname -m 2>/de
+ # 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
++# PROGRAMS != echo dmidecode ; test `uname -m 2>/dev/null` != ia64 && echo biosdecode ownership vpddecode
+ 
+ all : $(PROGRAMS)
+ 
diff --git a/dmidecode.spec b/dmidecode.spec
index 728a868..5cb74bf 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data
 Name:           dmidecode
 Version:        2.10
-Release: %(R="$Revision: 1.40 $"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -11,6 +11,7 @@ Patch1:         dmidecode-recognize-more-memory.patch
 Patch2:         dmidecode-add-socket-lga1366.patch
 Patch3:         dmidecode-warn-on-unsupported-smbios-version.patch
 Patch4:         dmidecode-smbios-2.6.1-updates.patch
+Patch5:         dmidecode-makefile-fix.patch
 URL:            http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
@@ -34,6 +35,7 @@ I/O ports (e.g. serial, parallel, USB).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 15 2010 Anton Arapov <aarapov at redhat.com> - 1:2.1.0-2
+- Does not build with gnu make v3.82+ (#631407)
+
 * Fri Dec 18 2009 Prarit Bhargava <prarit at redhat.com> - 1:2.1.0-1.40
 - Fix rpmlint errors in specfile