[packages/memtest86] - up to 4.3.3 (I haven't found sources other than from the iso image) - BR: p7zip - two patches comm

witekfl witekfl at pld-linux.org
Tue Sep 17 17:25:52 CEST 2013


commit 789b4656a3e591c50327be8a9081934d9000eee1
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Tue Sep 17 17:23:21 2013 +0200

    - up to 4.3.3 (I haven't found sources other than from the iso image)
    - BR: p7zip
    - two patches commented, probably outdated
    - rel 1

 memtest86.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/memtest86.spec b/memtest86.spec
index d2839a1..1011abe 100644
--- a/memtest86.spec
+++ b/memtest86.spec
@@ -8,18 +8,19 @@ Summary(pt_BR.UTF-8):	Testador de memória completo e independente para sistemas
 Summary(ru.UTF-8):	Тест памяти для x86-архитектуры
 Summary(uk.UTF-8):	Тест пам'яті для x86-архітектури
 Name:		memtest86
-Version:	3.2
-Release:	4
+Version:	4.3.3
+Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	http://www.memtest86.com/%{name}-%{version}.tar.gz
-# Source0-md5:	46028d276c39c2eebe7759ba813f97df
+Source0:	http://www.memtest86.com/downloads/%{name}-iso.gz
+# Source0-md5:	7d86f56656218f6ce4a7ec0d69d88517
 Source1:	%{name}.image
 Patch0:		%{name}-rover-centrino+c3+amd.patch
 Patch1:		%{name}-i686-ld.patch
 Patch2:		%{name}-enable_serial_console.patch
 URL:		http://www.memtest86.com/
 ExclusiveArch:	%{ix86}
+BuildRequires:	p7zip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,13 +77,16 @@ memtest86 image for rc-boot.
 Obraz memtest86 dla rc-boot.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -c
+gzip -dc %{SOURCE0} > memtest86-iso
+7z e memtest86-iso
+tar xf SRC.TGZ
+#%patch0 -p1
+#%patch1 -p1
 %{?with_serial_console:%patch2 -p1}
 
 %build
-%{__make} \
+%{__make} -C src \
 	CC="%{__cc}" \
 	CCFLAGS="%{rpmcflags} -fomit-frame-pointer -fno-builtin" \
 	SHELL=/bin/sh
@@ -94,7 +98,7 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/rc-boot/images
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-boot/images/%{name}
 
 install -d $RPM_BUILD_ROOT/boot
-install memtest.bin $RPM_BUILD_ROOT/boot/%{name}
+install src/memtest.bin $RPM_BUILD_ROOT/boot/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,7 +117,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc GUIDE.PDF src/README
 /boot/%{name}
 
 %files -n rc-boot-image-memtest86
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/memtest86.git/commitdiff/789b4656a3e591c50327be8a9081934d9000eee1



More information about the pld-cvs-commit mailing list