* Fri Oct 15 2010 Anton Arapov <aarapov@redhat.com> - 1:2.1.0-2

- Does not build with gnu make v3.82+ (#631407)
This commit is contained in:
Anton Arapov 2010-10-15 12:32:00 +02:00
parent 0cbe6394ba
commit 8e4de9a98f
2 changed files with 18 additions and 1 deletions

View File

@ -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)

View File

@ -1,7 +1,7 @@
Summary: Tool to analyse BIOS DMI data Summary: Tool to analyse BIOS DMI data
Name: dmidecode Name: dmidecode
Version: 2.10 Version: 2.10
Release: %(R="$Revision: 1.40 $"; RR="${R##: }"; echo ${RR%%?})%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
@ -11,6 +11,7 @@ Patch1: dmidecode-recognize-more-memory.patch
Patch2: dmidecode-add-socket-lga1366.patch Patch2: dmidecode-add-socket-lga1366.patch
Patch3: dmidecode-warn-on-unsupported-smbios-version.patch Patch3: dmidecode-warn-on-unsupported-smbios-version.patch
Patch4: dmidecode-smbios-2.6.1-updates.patch Patch4: dmidecode-smbios-2.6.1-updates.patch
Patch5: dmidecode-makefile-fix.patch
URL: http://www.nongnu.org/dmidecode/ URL: http://www.nongnu.org/dmidecode/
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf BuildRequires: /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
@ -34,6 +35,7 @@ I/O ports (e.g. serial, parallel, USB).
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
make CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS"
@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Fri Oct 15 2010 Anton Arapov <aarapov@redhat.com> - 1:2.1.0-2
- Does not build with gnu make v3.82+ (#631407)
* Fri Dec 18 2009 Prarit Bhargava <prarit@redhat.com> - 1:2.1.0-1.40 * Fri Dec 18 2009 Prarit Bhargava <prarit@redhat.com> - 1:2.1.0-1.40
- Fix rpmlint errors in specfile - Fix rpmlint errors in specfile