From 9f7118010de083ad8ef7014be3bd483551470aafeb28e5cfc6177a34578b0cc0 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 8 Mar 2016 18:42:04 +0000
Subject: [PATCH] - Remove hacks from /var/adm/update-scripts|messages case

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=205
---
 build-compare.changes |  5 +++++
 build-compare.spec    |  2 +-
 functions.sh          |  4 ++--
 pkg-diff.sh           | 14 ++------------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/build-compare.changes b/build-compare.changes
index 89fe6f4..83f134e 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar  8 18:00:40 UTC 2016 - olaf@aepfle.de
+
+- Remove hacks from /var/adm/update-scripts|messages case
+
 -------------------------------------------------------------------
 Tue Mar  8 16:48:48 UTC 2016 - olaf@aepfle.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 56959b7..8b61203 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -21,7 +21,7 @@ Summary:        Build Result Compare Script
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/build-compare
-Version:        20160308T174907.9a42867
+Version:        20160308T194108.4a952dd
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh
diff --git a/functions.sh b/functions.sh
index 02be91e..d16b041 100644
--- a/functions.sh
+++ b/functions.sh
@@ -40,11 +40,11 @@ function trim_release_new()
 # Get single directory or filename with long or short release string
 function grep_release_old()
 {
-  grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
+  grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src|/var/adm/update-scripts)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
 }
 function grep_release_new()
 {
-  grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
+  grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src|/var/adm/update-scripts)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
 }
 
 function check_provides()
diff --git a/pkg-diff.sh b/pkg-diff.sh
index 933ee90..f100be0 100644
--- a/pkg-diff.sh
+++ b/pkg-diff.sh
@@ -655,19 +655,9 @@ check_single_file()
       return 0
       ;;
     /var/adm/update-messages/*|/var/adm/update-scripts/*)
-      # encode version-release inside
-      oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;`
-
       # fetchmsttfonts embeds the release number in the update shell script.
-      echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn"
-      sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn"
-
-      if ! diff -u old/$oldfn new/$file; then
-           echo "$oldfn is not same as $file"
-           return 1
-      fi
-      echo "$file and $oldfn are same"
-      return 0
+      sed -i "s/${name_ver_rel_old_regex_l}/@NAME_VER_REL@/" old/$file
+      sed -i "s/${name_ver_rel_new_regex_l}/@NAME_VER_REL@/" new/$file
       ;;
     *.ps)
       for f in "old/$file" "new/$file"; do