Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2012-07-04 22:12:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-29
14:19:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-07-04
22:12:59.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 4 06:20:23 UTC 2012 - mch...@suse.com
+
+- add use-grub2-efi-as-a-package-name.patch (bnc#769916)
+
+-------------------------------------------------------------------
New:
----
use-grub2-efi-as-a-package-name.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.ONyPnc/_old 2012-07-04 22:13:01.000000000 +0200
+++ /var/tmp/diff_new_pack.ONyPnc/_new 2012-07-04 22:13:01.000000000 +0200
@@ -84,6 +84,7 @@
Patch6: grub2-iterate-and-hook-for-extended-partition.patch
Patch7: grub2-install-opt-skip-fs-probe.patch
Patch8: grub2-ppc-terminfo.patch
+Patch99: use-grub2-efi-as-a-package-name.patch
PreReq: perl-Bootloader
Requires: gettext-runtime
Requires: os-prober
@@ -145,6 +146,9 @@
cp %{SOURCE3} grub-%{version}/
%ifarch %{efi}
(cp -a grub-%{version} grub-efi-%{version})
+cd grub-efi-%{version}
+%patch99 -p1
+cd ..
%endif
%build
@@ -161,7 +165,7 @@
--target=%{_target_platform} \
--with-platform=efi \
--program-transform-name=s,grub,%{name}-efi,
-make %{?_smp_mflags} pkglibdir=%{_libdir}/%{name}-efi
pkgdatadir=%{_datadir}/%{name}-efi
+make %{?_smp_mflags}
%ifarch %{ix86}
%define grubefiarch i386-efi
%else
@@ -205,7 +209,7 @@
%install
%ifarch %{efi}
cd grub-efi-%{version}
-make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/%{name}-efi
pkgdatadir=%{_datadir}/%{name}-efi install
+make DESTDIR=$RPM_BUILD_ROOT install
# Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name}-efi
@@ -217,6 +221,7 @@
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}-efi/*/*.h
rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h
+%find_lang %{name}-efi
cd ..
%endif
@@ -345,7 +350,7 @@
%ifarch %{efi}
-%files efi
+%files efi -f grub-efi-%{version}/%{name}-efi.lang
%defattr(-,root,root,-)
%dir /boot/efi
%dir /boot/efi/EFI
++++++ use-grub2-efi-as-a-package-name.patch ++++++
From: Michael Chang <mch...@gmail.com>
Date: Wed, 4 Jun 2012 18:33:52 +0800
Subject: [PATCH] use grub2-efi as a package name
References: bnc#769916
Patch-Mainline: no
Use grub2-efi as package name when building grub2-efi package, this
fixes inconsistent @PACKAGE@ used by the scripts, for example.
Just fix those scripts one-by-one is probably not a good idea and
maybe tedious, as we can't know how many potential problem related
with it, better use same approach building grub2 to prevent such
discrete result.
Index: grub-2.00/configure
===================================================================
--- grub-2.00.orig/configure
+++ grub-2.00/configure
@@ -558,10 +558,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='GRUB2'
-PACKAGE_TARNAME='grub2'
+PACKAGE_NAME='GRUB2-EFI'
+PACKAGE_TARNAME='grub2-efi'
PACKAGE_VERSION='2.00'
-PACKAGE_STRING='GRUB2 2.00'
+PACKAGE_STRING='GRUB2-EFI 2.00'
PACKAGE_BUGREPORT='bug-g...@gnu.org'
PACKAGE_URL=''
@@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GRUB2 2.00 to adapt to many kinds of systems.
+\`configure' configures GRUB2-EFI 2.00 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1952,7 +1952,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/grub2]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/grub2-efi]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1975,7 +1975,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GRUB2 2.00:";;
+ short | recursive ) echo "Configuration of GRUB2-EFI 2.00:";;
esac
cat <<\_ACEOF
@@ -2108,7 +2108,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GRUB2 configure 2.00
+GRUB2-EFI configure 2.00
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GRUB2 $as_me 2.00, which was
+It was created by GRUB2-EFI $as_me 2.00, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3789,7 +3789,7 @@ fi
# Define the identity of the package.
- PACKAGE='grub2'
+ PACKAGE='grub2-efi'
VERSION='2.00'
Index: grub-2.00/configure.ac
===================================================================
--- grub-2.00.orig/configure.ac
+++ grub-2.00/configure.ac
@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Varia
dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
dnl type.
-AC_INIT([GRUB2],[2.00],[bug-g...@gnu.org])
+AC_INIT([GRUB2-EFI],[2.00],[bug-g...@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
