Accepting request 140933 from devel:openSUSE:Factory

Automatic submission by obs-autosubmit

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

grub2.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Nov  5 08:17:26 UTC 2012 - aj@suse.de
+
+- We really only need makeinfo, so require that one where it exists.
+
+-------------------------------------------------------------------
+Thu Nov  1 08:10:12 UTC 2012 - mchang@suse.com
+
+- ship a Secure Boot UEFI compatible bootloader (fate#314485)
+- Secure boot support in installer DVD (fate#314489)
+- prime support for package on SLE-11 (SP3) 
+  - remove buildrequire to libuse and ncurses 32-bit devel packages
+    as they are needed by grub-emu which we don't support
+  - remove buildrequire to freetype2-devel-32bit as it's not need
+    by grub2-mkfont and others
+  - buildrequire to xz instead of lzma
+  - buildrequire to texinfo instead of makeinfo
+  - remove buildrequire to autogen as it's not available in SLE-11
+  - add Makefile.util.am Makefile.core.am generated by autogen
+  - run autoreconf -vi instead of ./autogen.sh
+  - For SLE-11 remove buildrequire to gnu-unifont as it's not
+    yet available. Also do not package pf fonts created from it.
+  - workaround SLE-11 patch utility not rename file for us
+  - add -fno-inline-functions-called-once to CFLAGS to fix build
+    error on gcc 4.3.x
+  - not require os-prober for SLE-11, as package not yet ready
+
 -------------------------------------------------------------------
 Sat Oct 27 05:27:42 UTC 2012 - arvidjaar@gmail.com
 

grub2.spec

@@ -18,31 +18,29 @@
 
 Name:           grub2
 %ifarch x86_64 ppc64
-BuildRequires:  freetype2-devel-32bit
 BuildRequires:  gcc-32bit
 BuildRequires:  glibc-32bit
 BuildRequires:  glibc-devel-32bit
-BuildRequires:  libncurses5-32bit
-BuildRequires:  libusb-1_0-devel-32bit
-BuildRequires:  ncurses-devel-32bit
 %else
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
-BuildRequires:  libncurses5
-BuildRequires:  libusb-1_0-devel
-BuildRequires:  ncurses-devel
 %endif
-BuildRequires:  autogen
 BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
+BuildRequires:  freetype2-devel
 BuildRequires:  fuse-devel
+%if 0%{?suse_version} >= 1140
 BuildRequires:  gnu-unifont
-BuildRequires:  lzma
+%endif
+BuildRequires:  xz
+%if 0%{?suse_version} >= 1210
 BuildRequires:  makeinfo
+%else
+BuildRequires:  texinfo
+%endif
 BuildRequires:  python
 BuildRequires:  ruby
 BuildRequires:  xz-devel
@@ -86,6 +84,8 @@ Source4:        grub2.rpmlintrc
 Source5:        translations-20120622.tar.xz
 Source6:        grub2-once
 Source7:        20_memtest86+
+Source8:        Makefile.util.am
+Source9:        Makefile.core.am
 Source1000:     PATCH_POLICY
 Patch0:         grub2-correct-font-path.patch
 Patch1:         rename-grub-info-file-to-grub2.patch
@@ -107,7 +107,9 @@ Patch18:        grub2-fix-locale-en.mo.gz-not-found-error-message.patch
 Patch19:        grub2-fix-build-error-on-flex-2.5.37.patch
 PreReq:         perl-Bootloader
 Requires:       gettext-runtime
+%if 0%{?suse_version} >= 1140
 Requires:       os-prober
+%endif
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
 
@@ -154,6 +156,10 @@ cd grub-%{version}
 (cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
 %patch0 -p1
 %patch1 -p1
+# Workaround SLE11's patch utility did not rename the file for us
+%if 0%{?sles_version} == 11
+mv docs/grub.texi docs/grub2.texi
+%endif
 %patch2 -p1
 %patch3 -p1
 %patch6 -p1
@@ -178,6 +184,8 @@ cd ..
 
 # README.openSUSE
 cp %{SOURCE3} grub-%{version}/
+cp %{SOURCE8} grub-%{version}/
+cp %{SOURCE9} grub-%{version}/grub-core/
 %ifarch %{efi}
 (cp -a grub-%{version} grub-efi-%{version})
 %endif
@@ -185,9 +193,9 @@ cp %{SOURCE3} grub-%{version}/
 %build
 %ifarch %{efi}
 cd grub-efi-%{version}
-./autogen.sh
+autoreconf -vi
 # we don't want to let rpm to override *FLAGS by bogus ones
-CFLAGS="-fno-strict-aliasing "
+CFLAGS="-fno-strict-aliasing -fno-inline-functions-called-once "
 CXXFLAGS=" "
 FFLAGS=" "
 export CFLAGS CXXFLAGS FFLAGS
@@ -209,10 +217,10 @@ cd ..
 %endif
 
 cd grub-%{version}
-./autogen.sh
+autoreconf -vi
 
 # we don't want to let rpm to override *FLAGS by bogus ones
-CFLAGS="-fno-strict-aliasing "
+CFLAGS="-fno-strict-aliasing  -fno-inline-functions-called-once "
 CXXFLAGS=" "
 FFLAGS=" "
 export CFLAGS CXXFLAGS FFLAGS
@@ -263,7 +271,9 @@ touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
 
 # Remove devel files
 rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
+%if 0%{?suse_version} >= 1140
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h
+%endif
 
 %ifarch %{efi}
 # grub2-efi compatibility links until other packages are fixed
@@ -475,7 +485,9 @@ fi
 %{_libdir}/%{name}/%{grubcpu}-%{platform}/kernel.exec
 %{_libdir}/%{name}/%{grubcpu}-%{platform}/modinfo.sh
 %dir %{_datadir}/%{name}
+%if 0%{?suse_version} >= 1140
 %{_datadir}/%{name}/*.pf2
+%endif
 %{_datadir}/%{name}/grub-mkconfig_lib
 %{_infodir}/grub-dev.info*
 %{_infodir}/%{name}.info*