From b05c1505cb33be6d645909f77a99f7c521886deaeb11e38560718b4daebf0d7d Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 25 Oct 2011 14:00:45 +0000
Subject: [PATCH] Accepting request 89242 from devel:openSUSE:Factory

Add requires from efi subpackage to main package (bnc#72596) (forwarded request 89241 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/89242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=23
---
 grub2.changes                 | 12 ++++++++++++
 grub2.spec                    | 15 +++++++++------
 translations-20110531.tar.bz2 |  3 ---
 translations-20111024.tar.bz2 |  3 +++
 4 files changed, 24 insertions(+), 9 deletions(-)
 delete mode 100644 translations-20110531.tar.bz2
 create mode 100644 translations-20111024.tar.bz2

diff --git a/grub2.changes b/grub2.changes
index 813c32c..87f6592 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Oct 25 08:38:19 UTC 2011 - aj@suse.de
+
+- Add requires from efi subpackage to main package (bnc#72596)
+
+-------------------------------------------------------------------
+Mon Oct 24 13:11:39 CEST 2011 - jslaby@suse.de
+
+- update it and pl translations
+- cleanup spec file
+  * don't package efi files to non-efi package
+
 -------------------------------------------------------------------
 Thu Aug 25 14:46:04 UTC 2011 - aj@suse.de
 
diff --git a/grub2.spec b/grub2.spec
index ba73246..b7e3c7e 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -57,7 +57,7 @@ Source2:        grub.default
 Source3:        README.openSUSE
 Source4:        grub2.rpmlintrc
 # rsync -Lrtvz  translationproject.org::tp/latest/grub/ po
-Source5:        translations-20110531.tar.bz2
+Source5:        translations-20111024.tar.bz2
 Patch0:         gcc46-fixes.patch
 Patch2:         grub2-linux.patch
 Patch3:         gccwarn.patch
@@ -90,6 +90,8 @@ file that is part of this package's documentation for more information.
 
 Summary:        GRUB2 for EFI systems
 Group:          System/Boot
+Requires:       efibootmgr
+Requires:       grub2
 
 %description efi
 The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -252,7 +254,9 @@ fi
 %{_libdir}/%{name}
 %{_libdir}/grub/
 %{_sbindir}/%{name}-*
+%exclude %{_sbindir}/grub2-efi-*
 %{_bindir}/%{name}-*
+%exclude %{_bindir}/%{name}-efi-*
 %{_sysconfdir}/bash_completion.d/grub
 %config %{_sysconfdir}/default/grub
 %dir %{_sysconfdir}/grub.d
@@ -273,7 +277,6 @@ fi
 
 %files efi -f grub-%{version}/grub.lang
 %defattr(-,root,root,-)
-%dir /boot
 %dir /boot/efi
 %dir /boot/efi/EFI
 %attr(0755,root,root)/boot/efi/EFI/opensuse
@@ -287,17 +290,17 @@ fi
 %{_sbindir}/grub2-efi-probe
 %{_sbindir}/grub2-efi-reboot
 %{_sbindir}/grub2-efi-set-default
-#%{_sbindir}/grub2-efi-setup
+#%%{_sbindir}/grub2-efi-setup
 %{_bindir}/grub2-efi-bin2h
 %{_bindir}/grub2-efi-editenv
 %{_bindir}/grub2-efi-fstest
 %{_bindir}/grub2-efi-kbdcomp
 %{_bindir}/grub2-efi-menulst2cfg
-# %{_bindir}/grub2-efi-mkelfimage
+# %%{_bindir}/grub2-efi-mkelfimage
 %{_bindir}/grub2-efi-mkfont
 %{_bindir}/grub2-efi-mklayout
 %{_bindir}/grub2-efi-mkimage
-# %{_bindir}/grub2-efi-mkisofs
+# %%{_bindir}/grub2-efi-mkisofs
 %{_bindir}/grub2-efi-mkpasswd-pbkdf2
 %{_bindir}/grub2-efi-mkrelpath
 %ifnarch %{sparc} ppc ppc64
@@ -311,7 +314,7 @@ fi
 %config %{_sysconfdir}/grub.d/??_*
 %{_sysconfdir}/grub.d/README
 %{_sysconfdir}/grub2-efi.cfg
-%{_sysconfdir}/default/grub
+%config %{_sysconfdir}/default/grub
 %dir /boot/grub2-efi
 # Actually, this is replaced by update-grub from scriptlets,
 # but it takes care of modified persistent part
diff --git a/translations-20110531.tar.bz2 b/translations-20110531.tar.bz2
deleted file mode 100644
index a8bf7b6..0000000
--- a/translations-20110531.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cda7fad25659bacb5aebb960c6b531dd6ce7960de4f4729286629cad1bfe650
-size 160975
diff --git a/translations-20111024.tar.bz2 b/translations-20111024.tar.bz2
new file mode 100644
index 0000000..dd6339f
--- /dev/null
+++ b/translations-20111024.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df78da4585f0fd7a1f4a8187a3d662684914e25459df337b68074c0e7178a541
+size 174272