From 8ba3e4e65afcd07aaf65495e4eefbddeac2683f546bc6c313eafb65e93596a2e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 1 Feb 2014 08:47:26 +0000
Subject: [PATCH] Accepting request 220485 from
 home:oertel:branches:Base:System

- adapt uname linking in specfile to /usr move (bnc#860600)

- adapt uname.sh helper to 3.XX.Y kernel versioning scheme
- obs removes dashes...
- fix mktar to match service file
- do not mount and umount /proc in checks - the build script handles that

OBS-URL: https://build.opensuse.org/request/show/220485
OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=91
---
 ...ild-checks-13.2+git20140109.507e5c2.tar.xz |  3 ---
 ...ild-checks-13.2+git20140131.590c07b.tar.xz |  3 +++
 post-build-checks.changes                     | 13 ++++++++++++
 post-build-checks.spec                        | 20 +++++++++++++------
 4 files changed, 30 insertions(+), 9 deletions(-)
 delete mode 100644 post-build-checks-13.2+git20140109.507e5c2.tar.xz
 create mode 100644 post-build-checks-13.2+git20140131.590c07b.tar.xz

diff --git a/post-build-checks-13.2+git20140109.507e5c2.tar.xz b/post-build-checks-13.2+git20140109.507e5c2.tar.xz
deleted file mode 100644
index 1eb34a4..0000000
--- a/post-build-checks-13.2+git20140109.507e5c2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8faa5f3a942736cc35021a9df112efc7bc4bce9077a21cf3745662d3981c744a
-size 35072
diff --git a/post-build-checks-13.2+git20140131.590c07b.tar.xz b/post-build-checks-13.2+git20140131.590c07b.tar.xz
new file mode 100644
index 0000000..d337ff5
--- /dev/null
+++ b/post-build-checks-13.2+git20140131.590c07b.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fca1f2028335332e8f13422be0906f5a5c1b932cdd36a38187c3833f3a55e33
+size 34184
diff --git a/post-build-checks.changes b/post-build-checks.changes
index 9edd412..113dd56 100644
--- a/post-build-checks.changes
+++ b/post-build-checks.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan 31 15:31:34 CET 2014 - ro@suse.de
+
+- adapt uname linking in specfile to /usr move (bnc#860600) 
+
+-------------------------------------------------------------------
+Fri Jan 31 14:26:05 UTC 2014 - ro@suse.com
+
+- adapt uname.sh helper to 3.XX.Y kernel versioning scheme
+- obs removes dashes...
+- fix mktar to match service file
+- do not mount and umount /proc in checks - the build script handles that
+
 -------------------------------------------------------------------
 Thu Jan  9 11:06:05 UTC 2014 - coolo@suse.com
 
diff --git a/post-build-checks.spec b/post-build-checks.spec
index cfd75cb..932389d 100644
--- a/post-build-checks.spec
+++ b/post-build-checks.spec
@@ -20,7 +20,7 @@ Name:           post-build-checks
 Summary:        post checks for build after rpms have been created
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Version:        13.2+git20140109.507e5c2
+Version:        13.2+git20140131.590c07b
 Release:        0
 PreReq:         aaa_base permissions sed
 Requires:       aaa_base-malloccheck
@@ -88,17 +88,25 @@ if ! test -e /.buildenv; then
 fi
 sed -i -e "s@^PERMISSION_SECURITY=.*@PERMISSION_SECURITY=\"secure\"@" /etc/sysconfig/security
 sed -i -e "s@^TIMEZONE=.*@TIMEZONE=\"UTC\"@" /etc/sysconfig/clock
-if test -f /bin/uname -a ! -L /bin/uname ; then
-    mv /bin/uname /bin/uname.bin
-    ln -s /usr/lib/build/helper/uname.sh /bin/uname
+UNAME=/bin/uname
+if test -f /usr/bin/uname ; then
+    UNAME=/usr/bin/uname
+fi
+if test -f $UNAME -a ! -L $UNAME ; then
+    mv $UNAME $UNAME.bin
+    ln -s /usr/lib/build/helper/uname.sh $UNAME
 fi
 
 %preun
 if ! test -e /.buildenv; then
     exit 0
 fi
-if test "$1" = 0 -a -f /bin/uname.bin ; then
-    mv /bin/uname.bin /bin/uname
+UNAME=/bin/uname
+if test -f /usr/bin/uname.bin ; then
+    UNAME=/usr/bin/uname
+fi
+if test "$1" = 0 -a -f $UNAME.bin ; then
+    mv $UNAME.bin $UNAME
 fi
 
 %files