rpms/memtest86+/F-12 memtest-setup, 1.5, 1.6 memtest86+.spec, 1.50, 1.51 sources, 1.21, 1.22

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8274

Modified Files:
	memtest-setup memtest86+.spec sources 
Log Message:
* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
- Fix memtest-setup on systems without a separate /boot
  filesystem (#528651)
- Update to new upstream release, v4.00



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:33:50 -0000	1.5
+++ memtest-setup	13 Oct 2009 19:09:28 -0000	1.6
@@ -32,7 +32,7 @@ if [ "$RETVAL" != "0" ]; then
     echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
     exit $RETVAL
 else
-    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,kernel \(/boot\)\?/$ENAME,kernel --type=netbsd \1/$ENAME," /boot/grub/grub.conf
     sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
 fi
 


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/memtest86+.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- memtest86+.spec	18 Aug 2009 20:40:03 -0000	1.50
+++ memtest86+.spec	13 Oct 2009 19:09:28 -0000	1.51
@@ -6,16 +6,14 @@
 %define debug_package %{nil}
 
 Name:     memtest86+
-Version:  2.11
-Release:  11%{?dist}
+Version:  4.00
+Release:  2%{?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:  memtest-setup
 Source2:  new-memtest-pkg
-# Patch sent by Jarod to memtest86+ maintainer on 2009.08.18
-Patch0:   memtest86+-2.11-make-gcc4-builds-work.patch
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -41,7 +39,6 @@ to add the %{name} entry to your GRUB bo
 
 %prep
 %setup -q 
-#patch0 -p1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -87,6 +84,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
+- Fix memtest-setup on systems without a separate /boot
+  filesystem (#528651)
+
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
+- Update to new upstream release, v4.00
+- Drop gcc4.2+ patch, merged upstream
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> - 2.11-11
 - Fix runtime operation when built with gcc4.2+ (#442285)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Apr 2009 17:33:51 -0000	1.21
+++ sources	13 Oct 2009 19:09:28 -0000	1.22
@@ -1 +1 @@
-e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+898cfc5ff7920a8c396ebe898ac2eaa5  memtest86+-4.00.tar.gz