From c57620cacfaa5f67b7129080f5e22509cb15f9fb539a09ba2299692714f075fc Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Fri, 21 Feb 2014 15:23:38 +0000
Subject: [PATCH] - version 14.47

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=619
---
 gawk.patch                           | 15 ---------------
 installation-images-14.46.tar.bz2    |  3 ---
 installation-images-14.47.tar.bz2    |  3 +++
 installation-images-SLES.changes     | 11 +++++++++++
 installation-images-SLES.spec        |  4 ++--
 installation-images-openSUSE.changes |  6 ++++++
 installation-images-openSUSE.spec    |  6 ++----
 7 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 gawk.patch
 delete mode 100644 installation-images-14.46.tar.bz2
 create mode 100644 installation-images-14.47.tar.bz2

diff --git a/gawk.patch b/gawk.patch
deleted file mode 100644
index d62291c..0000000
--- a/gawk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/data/initrd/initrd.file_list b/data/initrd/initrd.file_list
-index 13ba0d1..113fba9 100644
---- a/data/initrd/initrd.file_list
-+++ b/data/initrd/initrd.file_list
-@@ -318,6 +318,10 @@ gzip:
-   /usr/bin/gzip
-   /usr/bin/gunzip
- 
-+gawk:
-+  /usr/bin/gawk
-+  s gawk usr/bin/awk
-+
- nscd:
-   # remaining files are in root image
-   d /var/run/nscd
diff --git a/installation-images-14.46.tar.bz2 b/installation-images-14.46.tar.bz2
deleted file mode 100644
index d77796b..0000000
--- a/installation-images-14.46.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56897b2f378e36d0dd0d25437904d00fd6b5cbd2dae0a2ac41c7913a2a1531c2
-size 184751
diff --git a/installation-images-14.47.tar.bz2 b/installation-images-14.47.tar.bz2
new file mode 100644
index 0000000..a3667c4
--- /dev/null
+++ b/installation-images-14.47.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11b6c7c529bd7840075145596b8389dc491a452b974403f0b327eb91be86b609
+size 184913
diff --git a/installation-images-SLES.changes b/installation-images-SLES.changes
index 21f225d..bdc7d80 100644
--- a/installation-images-SLES.changes
+++ b/installation-images-SLES.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 21 16:22:49 CET 2014 - snwint@suse.de
+
+- replace sles11.exec with sles12.exec (bnc #865109)
+- link gawk also in initrd or we get dangling symlinks
+
+-------------------------------------------------------------------
+Thu Feb 20 10:02:03 UTC 2014 - coolo@suse.com
+
+- also symlink awk in initrd
+
 -------------------------------------------------------------------
 Wed Feb 19 08:53:51 CET 2014 - snwint@suse.de
 
diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec
index ec69b03..4ad5188 100644
--- a/installation-images-SLES.spec
+++ b/installation-images-SLES.spec
@@ -353,9 +353,9 @@ ExcludeArch:    %arm
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.46
+Version:        14.47
 Release:        0
-Source:         installation-images-14.46.tar.bz2
+Source:         installation-images-14.47.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _binary_payload w.ufdio
 
diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes
index 630d053..bdc7d80 100644
--- a/installation-images-openSUSE.changes
+++ b/installation-images-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 21 16:22:49 CET 2014 - snwint@suse.de
+
+- replace sles11.exec with sles12.exec (bnc #865109)
+- link gawk also in initrd or we get dangling symlinks
+
 -------------------------------------------------------------------
 Thu Feb 20 10:02:03 UTC 2014 - coolo@suse.com
 
diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec
index ade1c4c..f7774e6 100644
--- a/installation-images-openSUSE.spec
+++ b/installation-images-openSUSE.spec
@@ -353,10 +353,9 @@ ExcludeArch:    %arm
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.46
+Version:        14.47
 Release:        0
-Source:         installation-images-14.46.tar.bz2
-Patch0:          gawk.patch
+Source:         installation-images-14.47.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _binary_payload w.ufdio
 
@@ -393,7 +392,6 @@ 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_