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
This commit is contained in:
OBS User autobuild 2010-09-10 13:25:45 +00:00 committed by Git OBS Bridge
parent 079d98863b
commit 74101bac6d
3 changed files with 29 additions and 17 deletions

View File

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

View File

@ -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 Tue May 5 10:02:31 CEST 2009 - coolo@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package dmidecode (Version 2.10) # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,13 +21,14 @@
Name: dmidecode Name: dmidecode
Url: http://www.nongnu.org/dmidecode/ Url: http://www.nongnu.org/dmidecode/
Version: 2.10 Version: 2.10
Release: 3 Release: 10
License: GPL v2 or later License: GPLv2+
Group: System/Console Group: System/Console
Provides: pmtools:/usr/sbin/dmidecode Provides: pmtools:/usr/sbin/dmidecode
AutoReqProv: on AutoReqProv: on
Summary: DMI table decoder Summary: DMI table decoder
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch1: %{name}-fix-makefile-for-GNU-make-3.82.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64 ExclusiveArch: %ix86 ia64 x86_64
Obsoletes: pmtools < 20071117 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 trusted. Dmidecode does not scan your hardware, it only reports what
the BIOS told it to. the BIOS told it to.
Authors:
--------
Alan Cox <alan@redhat.com>
Jean Delvare <khali@linux-fr.org>
%prep %prep
%setup %setup
%patch1 -p1
%build %build
make CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS"
@ -80,10 +75,3 @@ done
/%{_mandir}/man8/* /%{_mandir}/man8/*
%changelog %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.