From 317af7f80534b6c0ccec2d1287c498c4cba28e81bec55fbac69a4a37b5f8e917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Mon, 11 Jun 2018 09:30:49 +0000
Subject: [PATCH] Accepting request 613118 from home:michals

- openSUSE releases also preserve kabi (boo#1095148).

OBS-URL: https://build.opensuse.org/request/show/613118
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=467
---
 fileattrs.diff |  2 +-
 findksyms.diff | 12 ++++++------
 rpm.changes    |  5 +++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fileattrs.diff b/fileattrs.diff
index 850669c..dcf6e99 100644
--- a/fileattrs.diff
+++ b/fileattrs.diff
@@ -38,7 +38,7 @@
 +++ ./fileattrs/kmp.attr	2017-12-01 15:46:28.172720497 +0000
 @@ -0,0 +1,4 @@
 +%__kmp_provides		%{_rpmconfigdir}/find-provides.ksyms --opensuse 0%{?is_opensuse}
-+%__kmp_requires		%{_rpmconfigdir}/find-requires.ksyms --opensuse 0%{?is_opensuse}
++%__kmp_requires		%{_rpmconfigdir}/find-requires.ksyms --suse-release 0%{?sle_version}
 +%__kmp_supplements	%{_rpmconfigdir}/find-supplements.ksyms
 +%__kmp_path		^/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz)?
 --- ./fileattrs/perl.attr.orig	2017-08-10 08:08:07.113108701 +0000
diff --git a/findksyms.diff b/findksyms.diff
index 2472f7d..cd66a6d 100644
--- a/findksyms.diff
+++ b/findksyms.diff
@@ -107,16 +107,16 @@
 +
 +IFS=$'\n'
 +
-+is_opensuse=false
++is_tumbleweed=false
 +
-+if test "$1" = "--opensuse"; then
-+    if test "$2" -gt 0; then
-+        is_opensuse=true
++if test "$1" = "--suse-release"; then
++    if test "$2" -eq 0; then
++        is_tumbleweed=true
 +    fi
 +    shift 2
 +fi
 +
-+if ! $is_opensuse && ! test -e /sbin/modprobe; then
++if ! $is_tumbleweed && ! test -e /sbin/modprobe; then
 +    cat > /dev/null
 +    exit 0
 +fi
@@ -124,7 +124,7 @@
 +for f in $(grep -E '/lib/modules/.+\.ko$' | grep -v '/lib/modules/[^/]*/kernel/'); do
 +    flavor=${f#*/lib/modules/}
 +    flavor=${flavor%%/*}
-+    if $is_opensuse; then
++    if $is_tumbleweed; then
 +        echo "kernel-uname-r = $flavor"
 +        continue
 +    fi
diff --git a/rpm.changes b/rpm.changes
index 04e6145..fd477c5 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 30 10:48:49 UTC 2018 - msuchanek@suse.com
+
+- openSUSE releases also preserve kabi (boo#1095148).
+
 -------------------------------------------------------------------
 Mon May  7 16:36:45 CEST 2018 - mls@suse.de