packages: grub2/grub2.spec, grub2/grub-garbage.patch (NEW) - add grub-garba...

[glen]

Author: glen                         Date: Thu Nov 12 07:55:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add grub-garbage.patch from fedora

---- Files affected:
packages/grub2:
   grub2.spec (1.55 -> 1.56) , grub-garbage.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.55 packages/grub2/grub2.spec:1.56
--- packages/grub2/grub2.spec:1.55	Wed Nov 11 17:55:54 2009
+++ packages/grub2/grub2.spec	Thu Nov 12 08:55:45 2009
@@ -26,6 +26,7 @@
 BuildRequires:	autoconf >= 2.53
 Patch0:		pld-initrd.patch
 Patch1:		pld-sysconfdir.patch
+Patch2:		grub-garbage.patch
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gawk
@@ -107,6 +108,7 @@
 %setup -q -n grub-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -221,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2009/11/12 07:55:45  glen
+- add grub-garbage.patch from fedora
+
 Revision 1.55  2009/11/11 16:55:54  glen
 - add sysconfig/grub
 

================================================================
Index: packages/grub2/grub-garbage.patch
diff -u /dev/null packages/grub2/grub-garbage.patch:1.1
--- /dev/null	Thu Nov 12 08:55:51 2009
+++ packages/grub2/grub-garbage.patch	Thu Nov 12 08:55:45 2009
@@ -0,0 +1,50 @@
+http://lists.gnu.org/archive/html/grub-devel/2008-04/msg00079.html
+
+Self-explainable. Make update-grub ignore rpm leftover files and VIM
+swap files.
+
+2008-04-15  Lubomir Kundrak  <lkundrak at redhat.com>
+
+        * util/update-grub.in: replace the junk file switch with
+        unconditional call to grub_file_is_not_garbage
+        * util/update-grub_lib.in (grub_file_is_not_garbage): ignore
+        also rpm leftover files and editor backup files
+
+--- grub-1.97.1/util/grub-mkconfig.in~	2009-11-11 22:14:09.000000000 +0200
++++ grub-1.97.1/util/grub-mkconfig.in	2009-11-12 09:50:15.902686831 +0200
+@@ -247,18 +247,12 @@
+ EOF
+ 
+ for i in ${grub_mkconfig_dir}/* ; do
+-  case "$i" in
+-    # emacsen backup files. FIXME: support other editors
+-    *~) ;;
+-    *)
+-      if grub_file_is_not_garbage "$i" && test -x "$i" ; then
+-        echo
+-        echo "### BEGIN $i ###"
+-        "$i"
+-        echo "### END $i ###"
+-      fi
+-    ;;
+-  esac
++  if grub_file_is_not_garbage "$i" && test -x "$i" ; then
++    echo
++    echo "### BEGIN $i ###"
++    "$i"
++    echo "### END $i ###"
++  fi
+ done
+ 
+ if test "x${grub_cfg}" != "x" ; then
+--- grub-1.97.1/util/grub-mkconfig_lib.in~	2009-11-09 17:48:16.000000000 +0200
++++ grub-1.97.1/util/grub-mkconfig_lib.in	2009-11-12 09:52:32.845160944 +0200
+@@ -158,6 +158,8 @@
+   if test -f "$1" ; then
+     case "$1" in
+       *.dpkg-*) return 1 ;; # debian dpkg
++      *.rpmnew|*.rpmsave) return 1 ;; # Fedora rpm
++      *.bak|*~|.*.swp) return 1 ;;    # backup and swap files from editors
+     esac
+   else
+     return 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.55&r2=1.56&f=u