rpms/memtest86+/F-10 .cvsignore, 1.20, 1.21 memtest86+.spec, 1.41, 1.42 sources, 1.20, 1.21

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	.cvsignore memtest86+.spec sources 
Log Message:
- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
  during livecd-creator
- Put scripts into CVS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	9 Apr 2009 11:24:03 -0000	1.20
+++ .cvsignore	24 Apr 2009 17:41:45 -0000	1.21
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/memtest86+.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- memtest86+.spec	9 Apr 2009 11:24:03 -0000	1.41
+++ memtest86+.spec	24 Apr 2009 17:41:45 -0000	1.42
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?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
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{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
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{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}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	9 Apr 2009 11:24:03 -0000	1.20
+++ sources	24 Apr 2009 17:41:45 -0000	1.21
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz