packages: grubby/grubby-menu.lst.patch, grubby/grubby.spec - up to 8.3

[glen]

Author: glen                         Date: Wed Oct 26 09:36:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 8.3

---- Files affected:
packages/grubby:
   grubby-menu.lst.patch (1.3 -> 1.4) , grubby.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/grubby/grubby-menu.lst.patch
diff -u packages/grubby/grubby-menu.lst.patch:1.3 packages/grubby/grubby-menu.lst.patch:1.4
--- packages/grubby/grubby-menu.lst.patch:1.3	Thu May 28 00:03:22 2009
+++ packages/grubby/grubby-menu.lst.patch	Wed Oct 26 11:36:06 2011
@@ -1,22 +1,22 @@
---- mkinitrd-6.0.86/grubby/grubby.c~	2009-05-21 22:14:01.000000000 +0300
-+++ mkinitrd-6.0.86/grubby/grubby.c	2009-05-27 23:36:24.400378963 +0300
-@@ -140,7 +140,7 @@
+--- grubby-8.3/grubby.c~	2011-09-29 23:38:12.000000000 +0300
++++ grubby-8.3/grubby.c	2011-10-26 12:10:12.124419102 +0300
+@@ -157,7 +157,7 @@
  };
  
  struct configFileInfo grubConfigType = {
--    "/etc/grub.conf",			    /* defaultConfig */
-+    "/boot/grub/menu.lst",			    /* defaultConfig */
-     grubKeywords,			    /* keywords */
-     1,					    /* defaultIsIndex */
-     1,					    /* defaultSupportSaved */
---- mkinitrd-6.0.86/grubby/new-kernel-pkg~	2009-05-21 22:14:01.000000000 +0300
-+++ mkinitrd-6.0.86/grubby/new-kernel-pkg	2009-05-27 23:36:55.383790363 +0300
-@@ -73,7 +73,7 @@
+-    .defaultConfig = "/etc/grub.conf",
++    .defaultConfig = "/boot/grub/menu.lst",
+     .keywords = grubKeywords,
+     .defaultIsIndex = 1,
+     .defaultSupportSaved = 1,
+--- grubby-8.3/new-kernel-pkg~	2011-09-29 23:38:12.000000000 +0300
++++ grubby-8.3/new-kernel-pkg	2011-10-26 12:11:06.743604439 +0300
+@@ -91,7 +91,7 @@
  else
      # this leaves i?86 and x86_64
      liloConfig=/etc/lilo.conf
 -    grubConfig=$(readlink -f /etc/grub.conf 2>/dev/null)
 +    grubConfig=/boot/grub/menu.lst
+     grub2Config=$(readlink -f /etc/grub2.cfg 2>/dev/null)
+     grub2EfiConfig=$(readlink -f /etc/grub2-efi.cfg 2>/dev/null)
      bootPrefix=/boot
-     liloFlag=lilo
-     isx86="yes"

================================================================
Index: packages/grubby/grubby.spec
diff -u packages/grubby/grubby.spec:1.30 packages/grubby/grubby.spec:1.31
--- packages/grubby/grubby.spec:1.30	Mon Feb 14 13:02:30 2011
+++ packages/grubby/grubby.spec	Wed Oct 26 11:36:06 2011
@@ -6,12 +6,12 @@
 Summary:	Command line tool for updating bootloader configs
 Summary(pl.UTF-8):	Działające z linii poleceń narzędzie do konfiguracji gruba, lilo i elilo
 Name:		grubby
-Version:	7.0.16
+Version:	8.3
 Release:	1
 License:	GPL v2
 Group:		Base
-Source0:	http://pkgs.fedoraproject.org/repo/pkgs/grubby/%{name}-%{version}.tar.bz2/d838a5f794573f5704248b8322bf3643/grubby-%{version}.tar.bz2
-# Source0-md5:	d838a5f794573f5704248b8322bf3643
+Source0:	http://pkgs.fedoraproject.org/repo/pkgs/grubby/%{name}-%{version}.tar.bz2/b8ca2090b1ef8c107f0e5f5caa26f2f1/%{name}-%{version}.tar.bz2
+# Source0-md5:	b8ca2090b1ef8c107f0e5f5caa26f2f1
 URL:		http://git.fedorahosted.org/git/grubby.git
 Patch0:		%{name}-menu.lst.patch
 Patch1:		%{name}-pld.patch
@@ -42,7 +42,7 @@
 
 %prep
 %setup -q
-%patch0 -p2
+%patch0 -p1
 %patch1 -p2
 %patch2 -p1
 
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/10/26 09:36:06  glen
+- up to 8.3
+
 Revision 1.30  2011/02/14 12:02:30  glen
 - up to 7.0.16
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-menu.lst.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby.spec?r1=1.30&r2=1.31&f=u