Accepting request 116247 from devel:openSUSE:Factory

- grub2-automake-1-11-2.patch : fix grub2 build error on newer
  autotools (automake >= 1.11.2)
- call ./autogen.sh
- grub2-probe-disk-mountby.patch : fix grub2-probe fails on
  probing mount-by devices under /dev/disk/by-(id|uuid|path).
  (bnc#757746)

OBS-URL: https://build.opensuse.org/request/show/116247
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=33

grub2.spec

@@ -42,6 +42,8 @@ BuildRequires:  gnu-unifont
 BuildRequires:  lzma
 BuildRequires:  ruby
 BuildRequires:  xz
+BuildRequires:  autogen
+BuildRequires:  python
 
 # Modules always contain just 32-bit code
 %define _libdir %{_exec_prefix}/lib
@@ -78,6 +80,8 @@ Patch6:         grub2-iterate-and-hook-for-extended-partition.patch
 Patch7:         grub2-install-opt-skip-fs-probe.patch
 Patch8:         grub2-gcc47.patch
 Patch9:         os-prober_osx.patch
+Patch10:        grub2-probe-disk-mountby.patch
+Patch11:        grub2-automake-1-11-2.patch
 PreReq:         perl-Bootloader
 Requires:       gettext-runtime
 Requires:       os-prober
@@ -129,7 +133,7 @@ provides support for EFI systems.
 sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi >grub-%{version}/docs/grub2.texi
 sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am
 ## fix unifont location so grub-mkfont can create *.pf2 files
-sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure
+sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure.ac
 cd grub-%{version}
 %patch0 -p1
 %patch2 -p1
@@ -140,6 +144,8 @@ cd grub-%{version}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 cd ..
 
 # README.openSUSE
@@ -151,6 +157,7 @@ cp -a grub-%{version} grub-efi-%{version}
 %build
 %ifarch %{efi}
 cd grub-efi-%{version}
+./autogen.sh
 # we don't want to let rpm to override *FLAGS by bogus ones
 CFLAGS="-fno-strict-aliasing "
 CXXFLAGS=" "
@@ -173,7 +180,7 @@ make %{?_smp_mflags}
 cd ..
 %endif
 cd grub-%{version}
-#./autogen.sh
+./autogen.sh
 
 # we don't want to let rpm to override *FLAGS by bogus ones
 CFLAGS="-fno-strict-aliasing "
@@ -295,8 +302,9 @@ fi
 %files -f grub-%{version}/grub.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}
-%{_libdir}/grub/
 %{_sbindir}/%{name}-*
+%{_datadir}/%{name}
+%{_datadir}/grub
 %ifarch %{efi}
 %exclude %{_sbindir}/grub2-efi-*
 %endif
@@ -319,8 +327,6 @@ fi
 %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
 %{_infodir}/grub-dev.info*
 %{_infodir}/%{name}.info*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.pf2
 
 %ifarch %{efi}
 
@@ -365,7 +371,6 @@ fi
 %doc grub-%{version}/COPYING grub-%{version}/NEWS
 %doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
 %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
-%exclude %{_mandir}
 %dir %{_datadir}/%{name}-efi
 %{_datadir}/%{name}-efi/*.pf2
 %endif