Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2012-11-13 09:53:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2012-10-31
06:58:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-11-13
09:53:30.000000000 +0100
@@ -1,0 +2,27 @@
+Mon Nov 5 08:17:26 UTC 2012 - a...@suse.de
+
+- We really only need makeinfo, so require that one where it exists.
+
+-------------------------------------------------------------------
+Thu Nov 1 08:10:12 UTC 2012 - mch...@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
+
+-------------------------------------------------------------------
New:
----
Makefile.core.am
Makefile.util.am
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.FnjdzA/_old 2012-11-13 09:53:31.000000000 +0100
+++ /var/tmp/diff_new_pack.FnjdzA/_new 2012-11-13 09:53:31.000000000 +0100
@@ -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 @@
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 @@
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 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 @@
# 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 @@
%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 @@
%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 @@
# 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 @@
%{_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*
++++++ Makefile.core.am ++++++
++++ 58371 lines (skipped)
++++++ Makefile.util.am ++++++
++++ 16087 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
