rpms/xorg-x11-drv-nvidia-304xx/F-18 xorg-x11-drv-nvidia-304xx.spec, 1.3, 1.4
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14139/F-18
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Various fixes
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file:
/cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-nvidia-304xx.spec 7 Jun 2013 19:15:05 -0000 1.3
+++ xorg-x11-drv-nvidia-304xx.spec 8 Jun 2013 12:36:57 -0000 1.4
@@ -246,7 +246,7 @@
%post
if [ "$1" -eq "1" ]; then
ISGRUB1=""
- if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
ISGRUB1="--grub"
GFXPAYLOAD="vga=normal"
else
@@ -271,7 +271,7 @@
%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-1000
if [ "$1" -eq "1" ]; then
ISGRUB1=""
- if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
ISGRUB1="--grub"
GFXPAYLOAD="vga=normal"
else
@@ -301,11 +301,13 @@
%preun
if [ "$1" -eq "0" ]; then
ISGRUB1=""
- if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
ISGRUB1="--grub"
fi
if [ -x /sbin/grubby ] ; then
- KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ DIST=`rpm -E %%{?dist}`
+ ARCH=`uname -m`
+ KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}{,.PAE}`
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
@@ -378,6 +380,8 @@
%changelog
* Fri Jun 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-3
- Add GRUB_GFXPAYLOAD_LINUX=text by default
+- Fix PAE kvarriant on uninstall
+- Fix grub.cfg path for grub2
* Sun Jun 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-2
- Use triggerpostun to re-introduce boot options on rename