rpms/memtest86+/devel .cvsignore, 1.19, 1.20 import.log, 1.3, 1.4 memtest86+.spec, 1.43, 1.44 sources, 1.19, 1.20 memtest-setup, 1.3, NONE new-memtest-pkg, 1.1, NONE

Mon Apr 6 21:41:31 UTC 2009

Author: roma

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13597/devel

Modified Files:
	.cvsignore import.log memtest86+.spec sources 
Removed Files:
	memtest-setup new-memtest-pkg 
Log Message:
Building the elf and the bin versions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20

--- .cvsignore	28 Feb 2009 00:21:49 -0000	1.19
+++ .cvsignore	6 Apr 2009 21:41:00 -0000	1.20
@@ -1 +1,2 @@
 memtest86+-2.11.tar.gz
+temp.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2009 13:34:30 -0000	1.3
+++ import.log	6 Apr 2009 21:41:00 -0000	1.4
@@ -1,3 +1,4 @@
 memtest86+-2_11-4_fc10:HEAD:memtest86+-2.11-4.fc10.src.rpm:1236973348
 memtest86+-2_11-5_fc10:HEAD:memtest86+-2.11-5.fc10.src.rpm:1238510694
 memtest86+-2_11-6_fc10:HEAD:memtest86+-2.11-6.fc10.src.rpm:1238679177
+memtest86+-2_11-7_fc10:HEAD:memtest86+-2.11-7.fc10.src.rpm:1239054010


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- memtest86+.spec	2 Apr 2009 13:34:30 -0000	1.43
+++ memtest86+.spec	6 Apr 2009 21:41:00 -0000	1.44
@@ -1,29 +1,25 @@
+%bcond_with update_grub
+
 # Prevent stripping
 %define __spec_install_post /usr/lib/rpm/brp-compress
 # Turn off debuginfo package
 %define debug_package %{nil}
-%bcond_with update_grub
 
-Summary: Stand-alone memory tester for x86 and x86-64 computers
-Name: memtest86+
-Version: 2.11
-Release: 6%{?dist}
-License: GPLv2
-ExclusiveArch: %{ix86} x86_64
-Group: System Environment/Base
-Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-URL: http://www.memtest.org
-Source1: new-memtest-pkg
-Source2: memtest-setup
+Name:     memtest86+
+Version:  2.11
+Release:  7%{?dist}
+License:  GPLv2
+Summary:  Stand-alone memory tester for x86 and x86-64 computers
+Group:    System Environment/Base
+Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+Source1:  temp.tar.gz
+URL:      http://www.memtest.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 BuildRequires: compat-gcc-34
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: /sbin/grubby sed
-%if %{with update_grub}
-Requires(preun): coreutils
-Requires(post): coreutils
-%endif
+Requires: /sbin/grubby sed coreutils
+ExclusiveArch: %{ix86} x86_64
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -31,23 +27,24 @@
 check and often miss many of the failures that are detected by 
 Memtest86+.
 
-This version avoids the following errors when booting from grub:
+The ELF version should be used for booting from grub,
+and avoids the following errors:
 "Error 7: Loading below 1MB is not supported"
 "Error 13: Invalid or unsupported executable format"
 "Error 28: Selected item cannot fit into memory"
 
-Please, run '/usr/sbin/memtest-setup' as root to add 
-the memtest86+ entry to your GRUB or lilo boot menu.
+The script '%{_sbindir}/memtest-setup' can be run (as root)
+to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q
+%setup -q -a 1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
-make CC=gcc34
 # It makes no sense to use smp flags here.
+make CC=gcc34
 
 %install
 rm -rf %{buildroot}
@@ -55,17 +52,21 @@
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_sbindir}
 
-# install the ELF version, not the floppy (memtest.bin) one.
-install -m644 memtest %{buildroot}/boot/%{name}-%{version}
-install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
-install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
+# the ELF (memtest) version.
+install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+
+# the floppy (memtest.bin) version.
+install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
+
+install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
+install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -76,10 +77,17 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
+/boot/%{name}-elf-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
+
 %changelog
+
+* Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
+- adapted the spec file for building the elf and 
+  the bin versions #494157
+
 * Thu Apr 02 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-6
 - grub.conf will not be updated by default. The user
   will have to add and/or remove memtest86+ entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Feb 2009 00:21:49 -0000	1.19
+++ sources	6 Apr 2009 21:41:00 -0000	1.20
@@ -1 +1,2 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+518763b187bb85249120d06dfebd1235  temp.tar.gz


--- memtest-setup DELETED ---


--- new-memtest-pkg DELETED ---


