From e70a94c569ffc736a3bd3bb86dd222c139df3f2a03104f226e55456f0466d759 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Mon, 5 May 2014 12:29:33 +0000
Subject: [PATCH] Accepting request 232452 from openSUSE:Factory:PowerPC

- Remove lilo from BuildRequires
- Fix gawk symlink in base
- Require pdisk on ppc ppc64

OBS-URL: https://build.opensuse.org/request/show/232452
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=674
---
 gawk.patch                           | 15 +++++++++++++++
 installation-images-SLES.spec        |  4 +++-
 installation-images-openSUSE.changes |  7 +++++++
 installation-images-openSUSE.spec    | 18 +++++++++++-------
 4 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 gawk.patch

diff --git a/gawk.patch b/gawk.patch
new file mode 100644
index 0000000..bccc38d
--- /dev/null
+++ b/gawk.patch
@@ -0,0 +1,15 @@
+Index: installation-images-14.86/data/base/base.file_list
+===================================================================
+--- installation-images-14.86.orig/data/base/base.file_list
++++ installation-images-14.86/data/base/base.file_list
+@@ -118,6 +118,10 @@ yast2-trans-allpacks: requires,nodeps
+   x mk_yast2_trans bin/mk_yast2_trans
+   E mk_yast2_trans yast2-trans-allpacks.requires
+ 
++update-alternatives:ignore
++gawk:
++  /usr/bin/gawk
++  s gawk usr/bin/awk
+ 
+ :
+ 
diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec
index 14293b0..651cf94 100644
--- a/installation-images-SLES.spec
+++ b/installation-images-SLES.spec
@@ -291,7 +291,9 @@ BuildRequires:  tightvnc
 %endif
 %endif
 %ifarch ppc ppc64 ppc64le
-BuildRequires:  lilo
+%ifnarch ppc64le
+BuildRequires:  pdisk
+%endif
 BuildRequires:  powerpc-utils
 BuildRequires:  grub2-powerpc-ieee1275
 %endif
diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes
index 7d01903..8e5b41a 100644
--- a/installation-images-openSUSE.changes
+++ b/installation-images-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  2 15:15:10 UTC 2014 - dvaleev@suse.com
+
+- Remove lilo from BuildRequires
+- Fix gawk symlink in base
+- Require pdisk on ppc ppc64
+
 -------------------------------------------------------------------
 Wed Apr 30 13:16:09 CEST 2014 - snwint@suse.de
 
diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec
index cf0dd6e..8e65ff3 100644
--- a/installation-images-openSUSE.spec
+++ b/installation-images-openSUSE.spec
@@ -45,9 +45,6 @@ BuildRequires:  sles-release-MINI
 BuildRequires:  openSUSE-release
 BuildRequires:  openSUSE-release-mini
 %endif
-BuildRequires:  sysvinit-tools
-BuildRequires:  haveged
-BuildRequires:  raleway-fonts
 BuildRequires:  Mesa
 BuildRequires:  Mesa-libEGL1
 BuildRequires:  aaa_base
@@ -99,6 +96,7 @@ BuildRequires:  gpg2
 BuildRequires:  gpm
 BuildRequires:  graphviz
 BuildRequires:  graphviz-gnome
+BuildRequires:  haveged
 BuildRequires:  hdparm
 BuildRequires:  hex
 BuildRequires:  hfsutils
@@ -112,9 +110,12 @@ BuildRequires:  joe
 BuildRequires:  kbd
 BuildRequires:  kernel-default
 BuildRequires:  kernel-firmware
+BuildRequires:  raleway-fonts
+BuildRequires:  sysvinit-tools
 %ifnarch ppc64le aarch64
 BuildRequires:  kexec-tools
 %endif
+BuildRequires:  kmod-compat
 BuildRequires:  krb5-devel
 BuildRequires:  less
 BuildRequires:  libpcsclite1
@@ -131,7 +132,6 @@ BuildRequires:  mingetty
 BuildRequires:  mkfontdir
 BuildRequires:  mkfontscale
 BuildRequires:  mkinitrd
-BuildRequires:  kmod-compat
 BuildRequires:  mtools
 BuildRequires:  multipath-tools
 BuildRequires:  nasm
@@ -251,9 +251,9 @@ BuildRequires:  xorg-x11-Xvnc
 BuildRequires:  atmel-firmware
 BuildRequires:  dos2unix
 BuildRequires:  ftp
+BuildRequires:  hyper-v
 BuildRequires:  ipw-firmware
 BuildRequires:  tftp
-BuildRequires:  hyper-v
 %if %{with xen}
 BuildRequires:  kernel-xen
 BuildRequires:  xen-kmp-default
@@ -291,9 +291,11 @@ BuildRequires:  tightvnc
 %endif
 %endif
 %ifarch ppc ppc64 ppc64le
-BuildRequires:  lilo
-BuildRequires:  powerpc-utils
+%ifnarch ppc64le
+BuildRequires:  pdisk
+%endif
 BuildRequires:  grub2-powerpc-ieee1275
+BuildRequires:  powerpc-utils
 %endif
 %ifarch %ix86 x86_64
 BuildRequires:  acpica
@@ -359,6 +361,7 @@ Version:        14.86
 Release:        0
 Provides:       installation-images = %version-%release
 Source:         installation-images-14.86.tar.xz
+Patch0:         gawk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _binary_payload w.ufdio
 
@@ -395,6 +398,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
 %prep
 %setup -n installation-images-%{version}
 rm -f /usr/lib/build/checks/04-check-filelist
+%patch0 -p1
 
 %build
 unset MALLOC_CHECK_