rpms/memtest86+/devel import.log,1.1,1.2 memtest86+.spec,1.41,1.42

[Paulo Roma Cavalcanti]

Author: roma

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

Modified Files:
	import.log memtest86+.spec 
Log Message:
Fixed post and preun sections of the spec file.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Mar 2009 19:43:54 -0000	1.1
+++ import.log	31 Mar 2009 14:46:05 -0000	1.2
@@ -1 +1,2 @@
 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


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- memtest86+.spec	13 Mar 2009 19:43:54 -0000	1.41
+++ memtest86+.spec	31 Mar 2009 14:46:05 -0000	1.42
@@ -2,12 +2,12 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 # Turn off debuginfo package
 %define debug_package %{nil}
-%bcond_with update-grub.conf
+%bcond_with update_grub
 
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 2.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -15,11 +15,13 @@
 URL: http://www.memtest.org
 Source1: new-memtest-pkg
 Source2: memtest-setup
-Requires(preun): coreutils
 # 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
+Requires(preun): coreutils
+Requires(post): coreutils
 
 %description
 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 
@@ -56,43 +58,23 @@
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %post
-%if %{with update-grub.conf}
-if [ -x /sbin/grubby ] ; then
-   /sbin/grubby \
-        --add-kernel="/boot/%{name}-%{version}" \
-        --title "Memtest86+ (%{version})"
-
-   sed -i -e's,kernel /%{name}-%{version},kernel --type=netbsd /%{name}-%{version},' /boot/grub/grub.conf
-fi
+%if %{with update_grub}
+   /usr/sbin/memtest-setup
 %else
-cat << EOF
+   cat << EOF
 
-************************************************
-* REMINDER: Please update your /etc/grub.conf  *
-* file and add the memtest86+ boot entry,      *
-* by running /usr/sbin/memtest-setup as root.  *
-************************************************
+   ************************************************
+   * REMINDER: Please update your /etc/grub.conf  *
+   * file and add the memtest86+ boot entry,      *
+   * by running /usr/sbin/memtest-setup as root.  *
+   ************************************************
 
-EOF
-%endif
-
-%postun
-%if %{with update-grub.conf}
-if [ -x /sbin/grubby ] ; then
-   sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
-   /sbin/grubby --remove-kernel="/boot/%{name}-%{version}"
-fi
-%else
-cat << EOF
-
-************************************************
-* REMINDER: Please update your /etc/grub.conf  *
-* file and remove any memtest86+ boot entry.   *
-************************************************
-
-EOF
+   EOF
 %endif
 
+%preun
+sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+/sbin/new-memtest-pkg --remove %{version}
 
 %clean
 rm -rf %{buildroot}
@@ -105,6 +87,10 @@
 %{_sbindir}/memtest-setup
 
 %changelog
+* Mon Mar 31 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-5
+- Changed postun for preun.
+- Calling memtest-setup in case of updating grub.conf
+
 * Mon Mar 11 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-4
 - Updated to 2.11
 - Patched for booting from grub.