diff --git a/memtest86+.changes b/memtest86+.changes index 188f305..38e7620 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 19 11:11:09 UTC 2018 - mpluskal@suse.com + +- Enable parallel build +- Modernise spec file with spec-cleaner + ------------------------------------------------------------------- Fri Oct 30 13:57:22 UTC 2015 - jkeil@suse.de diff --git a/memtest86+.spec b/memtest86+.spec index d9548f4..f40a5c9 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -1,7 +1,7 @@ # # spec file for package memtest86+ # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,47 +19,45 @@ Name: memtest86+ Version: 5.01 Release: 0 -# -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#!BuildIgnore: gcc-PIE -%ifarch x86_64 -BuildRequires: glibc-devel-32bit -%endif -PreReq: perl -PreReq: /sbin/update-bootloader -ExclusiveArch: %ix86 x86_64 -Provides: lilo:/boot/memtest.bin -Obsoletes: memtest86 <= 3.2 -Provides: memtest86 > 3.2 -# -Url: http://www.memtest.org +Summary: Memory Testing Image for x86 Architecture +License: BSD-3-Clause +Group: System/Boot +URL: http://www.memtest.org Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz Patch0: fix-destdir Patch1: memtest86+-5.01-no-optimization.patch Patch2: memtest86+-5.01-compile-fix.patch Patch3: memtest86+-5.01-array-size-fix.patch Patch4: memtest86+-gcc5.patch -Summary: Memory Testing Image for x86 Architecture -License: BSD-3-Clause -Group: System/Boot +#!BuildIgnore: gcc-PIE +Requires(pre): /sbin/update-bootloader +Requires(pre): perl +Provides: lilo:/boot/memtest.bin +Obsoletes: memtest86 <= 3.2 +Provides: memtest86 > 3.2 +ExclusiveArch: %{ix86} x86_64 +%ifarch x86_64 +BuildRequires: glibc-devel-32bit +%endif %description -Memtest86 is an image that can be booted instead of a real OS. Once -booted, it can be used to test the computer's memory. +Memtest86 is an image that can be booted instead of a real OS. Once booted, +it can be used to test the computer's memory. %prep -%setup +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 + %build - make +make %{?_smp_mflags} %install -install -D -m 0644 memtest.bin $RPM_BUILD_ROOT/boot/memtest.bin +install -Dpm 0644 memtest.bin \ + %{buildroot}/boot/memtest.bin %post if [ "$YAST_IS_RUNNING" != instsys -a $1 = 1 -a \ @@ -72,7 +70,6 @@ true test -x /sbin/update-bootloader && /sbin/update-bootloader --remove --force --image /boot/memtest.bin || true %files -%defattr(-,root,root) /boot/memtest.bin %doc README* changelog FAQ