rpms/grub2/devel grub-1.98-persistent.patch, 1.1, 1.2 grub2.spec, 1.2, 1.3
Lubomir Rintel
lkundrak at fedoraproject.org
Wed Aug 27 11:56:37 UTC 2008
- Previous message (by thread): rpms/ibus-anthy/F-9 .cvsignore, 1.4, 1.5 ibus-anthy.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/clucene/devel .cvsignore, 1.4, 1.5 clucene.spec, 1.7, 1.8 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/grub2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316
Modified Files:
grub-1.98-persistent.patch grub2.spec
Log Message:
rediff patch to work around rpm fuzz bug
grub-1.98-persistent.patch:
Index: grub-1.98-persistent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/grub-1.98-persistent.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-1.98-persistent.patch 27 Aug 2008 08:07:28 -0000 1.1
+++ grub-1.98-persistent.patch 27 Aug 2008 11:56:37 -0000 1.2
@@ -4,11 +4,11 @@
Lubomir Rintel <lkundrak at v3.sk>
-diff -Nurp grub2.orig/conf/common.rmk grub2/conf/common.rmk
---- grub2.orig/conf/common.rmk 2008-08-07 21:37:16.000000000 +0200
-+++ grub2/conf/common.rmk 2008-08-08 07:14:01.000000000 +0200
-@@ -123,6 +123,12 @@ CLEANFILES += update-grub_lib
- update-grub_SCRIPTS = 00_header 10_linux 10_hurd 10_windows 30_os-prober 40_custom
+diff -up grub2/conf/common.rmk.persistent grub2/conf/common.rmk
+--- grub2/conf/common.rmk.persistent 2008-08-27 10:49:16.000000000 +0200
++++ grub2/conf/common.rmk 2008-08-27 13:51:33.000000000 +0200
+@@ -138,6 +138,12 @@ endif
+
CLEANFILES += $(update-grub_SCRIPTS)
+90_persistent: util/grub.d/90_persistent.in config.status
@@ -20,9 +20,9 @@
update-grub_DATA += util/grub.d/README
-diff -Nurp grub2.orig/util/grub.d/90_persistent.in grub2/util/grub.d/90_persistent.in
---- grub2.orig/util/grub.d/90_persistent.in 1970-01-01 01:00:00.000000000 +0100
-+++ grub2/util/grub.d/90_persistent.in 2008-08-08 07:14:01.000000000 +0200
+diff -up /dev/null grub2/util/grub.d/90_persistent.in
+--- /dev/null 2008-08-24 16:09:23.777049452 +0200
++++ grub2/util/grub.d/90_persistent.in 2008-08-27 13:51:33.000000000 +0200
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
@@ -61,9 +61,9 @@
+ /### END $ME ###/ {echo = 0; next}
+ {if (echo) print}
+" ${GRUBCFG}
-diff -Nurp grub2.orig/util/update-grub.in grub2/util/update-grub.in
---- grub2.orig/util/update-grub.in 2008-08-08 07:13:41.000000000 +0200
-+++ grub2/util/update-grub.in 2008-08-08 07:14:01.000000000 +0200
+diff -up grub2/util/update-grub.in.persistent grub2/util/update-grub.in
+--- grub2/util/update-grub.in.persistent 2008-08-27 13:51:33.000000000 +0200
++++ grub2/util/update-grub.in 2008-08-27 13:51:33.000000000 +0200
@@ -176,11 +176,12 @@ echo "Updating ${grub_cfg} ..." >&2
cat << EOF
Index: grub2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/grub2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub2.spec 27 Aug 2008 09:06:33 -0000 1.2
+++ grub2.spec 27 Aug 2008 11:56:37 -0000 1.3
@@ -98,7 +98,7 @@
%patch5 -p1 -b .os
%patch6 -p1 -b .cfgmode
%patch7 -p1 -b .garbage
-%patch8 -F2 -p1 -b .persistent
+%patch8 -p1 -b .persistent
%patch9 -p0 -b .linuxsort
%patch10 -p1 -b .dlsym
%patch13 -p1 -b .preserve-symbols
- Previous message (by thread): rpms/ibus-anthy/F-9 .cvsignore, 1.4, 1.5 ibus-anthy.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/clucene/devel .cvsignore, 1.4, 1.5 clucene.spec, 1.7, 1.8 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list