- up to final 1.99; patch3 needs fix (otherwise without it it builds)

Changed files:
    grub-shelllib.patch -> 1.3
    grub2.spec -> 1.101

diff --git a/grub-shelllib.patch b/grub-shelllib.patch
index 63464243edc93e35d0e23b578ac3eafa75263b86..f69e3a6e8123a63b0d6f007a7ad1cbccdf46bd18 100644 (file)
--- a/grub-shelllib.patch
+++ b/grub-shelllib.patch
@@ -1,31 +1,3 @@
---- grub-1.97.1/Makefile.in~   2009-11-09 17:48:15.000000000 +0200
-+++ grub-1.97.1/Makefile.in    2009-11-17 12:33:36.678701742 +0200
-@@ -293,12 +293,12 @@
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-       done
--      $(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-+      $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib
-       @list='$(lib_SCRIPTS)'; \
-       for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
--        $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
-+        $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/$$dest; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
-       @list='$(info_INFOS)'; \
-@@ -343,8 +343,8 @@
-       @list='$(lib_SCRIPTS)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
--        echo rm -f $(DESTDIR)$(libdir)/$$dest; \
--        rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
-+        echo rm -f $(DESTDIR)/lib/$$dest; \
-+        rm -f $(DESTDIR)/lib/$$dest; \
-       done
-       @list='$(info_INFOS)'; \
-       for file in $$list; do \
 --- grub-1.97.1.shelllib/util/grub.d/00_header.in      2009-11-09 17:48:16.000000000 +0200
 +++ grub-1.97.1/util/grub.d/00_header.in       2009-11-17 12:34:23.164322142 +0200
 @@ -23,7 +23,7 @@

diff --git a/grub2.spec b/grub2.spec
index 600ca7fcc48ff2a53165f987258cfae40aaff75d..b87523a328734df8d53ef1402f34307ed79dfacf 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -29,14 +29,13 @@ Summary(de.UTF-8):  GRUB2 - ein Bootloader für x86 und ppc
 Summary(hu.UTF-8):     GRUB2 - rendszerbetöltő x86 és ppc gépekhez
 Summary(pl.UTF-8):     GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):  Gerenciador de inicialização GRUB2
-%define        rcver   rc2
 Name:          grub2
 Version:       1.99
-Release:       0.%{rcver}.1
+Release:       0.1
 License:       GPL v2
 Group:         Base
-Source0:       http://alpha.gnu.org/gnu/grub/grub-%{version}~%{rcver}.tar.gz
-# Source0-md5: bfdc87ece4fd9ec1c4104e97e5094382
+Source0:       http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
+# Source0-md5: 27e360b951f006c464299d06bbd63442
 Source1:       update-grub
 Source2:       update-grub.8
 Source3:       grub.sysconfig
@@ -183,11 +182,11 @@ O GRUB pode ser uma boa alternativa ao LILO, para usuários mais
 avançados e que querem mais recursos de seu boot loader.
 
 %prep
-%setup -q -n grub-%{version}~%{rcver}
+%setup -q -n grub-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -242,6 +241,8 @@ install -d $RPM_BUILD_ROOT{/etc/sysconfig,%{_sysconfdir}/grub.d}
        pkglibdir=%{_libexecdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang grub
+
 # this must be after 'make install'
 install -d $RPM_BUILD_ROOT%{_libexecdir}/locale
 
@@ -281,7 +282,7 @@ fi
 echo "Grub was upgraded, trying to setup it to boot sector"
 /sbin/grub-install '(hd0)' || :
 
-%files
+%files -f grub.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub