rpms/memtest86+/F-11 memtest-setup, 1.5, 1.6 memtest86+.spec, 1.46, 1.47 sources, 1.21, 1.22

[Jarod Wilson]

Author: jwilson

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

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
- Build with gcc4 instead of gcc34 (#442285)



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:36:16 -0000	1.5
+++ memtest-setup	20 Oct 2009 16:31:56 -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-11/memtest86+.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- memtest86+.spec	24 Apr 2009 19:15:28 -0000	1.46
+++ memtest86+.spec	20 Oct 2009 16:31:56 -0000	1.47
@@ -6,8 +6,8 @@
 %define debug_package %{nil}
 
 Name:     memtest86+
-Version:  2.11
-Release:  9%{?dist}
+Version:  4.00
+Release:  2%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -45,7 +45,7 @@ sed -i -e's,0x10000,0x100000,' memtest.l
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
 # It makes no sense to use smp flags here.
-make CC=gcc34
+make
 
 %install
 rm -rf %{buildroot}
@@ -84,6 +84,20 @@ 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)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
 - Fix uninstall to remove stanza from grub.conf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Apr 2009 17:36:16 -0000	1.21
+++ sources	20 Oct 2009 16:31:56 -0000	1.22
@@ -1 +1 @@
-e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+898cfc5ff7920a8c396ebe898ac2eaa5  memtest86+-4.00.tar.gz