Accepting request 109810 from Base:System

The cleanup of the spec was done by some unavoidable osc magic.

The main modification of the package is:
- PreReq perl to avoid update-bootloader to abort while install; (bnc#730022). (forwarded request 109802 from lmuelle)

OBS-URL: https://build.opensuse.org/request/show/109810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memtest86+?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2012-03-20 10:29:43 +00:00 committed by Git OBS Bridge
commit 44298d6343
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 17 14:19:45 UTC 2012 - lars@samba.org
- PreReq perl to avoid update-bootloader to abort while install; (bnc#730022).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 30 11:47:34 UTC 2011 - trenn@suse.de Wed Mar 30 11:47:34 UTC 2011 - trenn@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package memtest86+ # spec file for package memtest86+
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 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
@ -16,19 +16,17 @@
# #
Name: memtest86+ Name: memtest86+
Version: 4.20 Version: 4.20
Release: 1 Release: 0
# #
License: BSD-3-Clause
Group: System/Boot
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cdrkit-cdrtools-compat BuildRequires: cdrkit-cdrtools-compat
%ifarch x86_64 %ifarch x86_64
BuildRequires: glibc-devel-32bit BuildRequires: glibc-devel-32bit
%endif %endif
PreReq: perl
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
Provides: lilo:/boot/memtest.bin Provides: lilo:/boot/memtest.bin
Obsoletes: memtest86 <= 3.2 Obsoletes: memtest86 <= 3.2
@ -38,6 +36,8 @@ Url: http://www.memtest.org
Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2 Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2
Patch0: fix-destdir Patch0: fix-destdir
Summary: Memory Testing Image for x86 Architecture Summary: Memory Testing Image for x86 Architecture
License: BSD-3-Clause
Group: System/Boot
%description %description
Memtest86 is an image that can be booted instead of a real OS. Once Memtest86 is an image that can be booted instead of a real OS. Once