Accepting request 285888 from home:jones_tony:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/285888
OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=68

elfutils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 11 01:28:52 UTC 2015 - tonyj@suse.com
+
+- Make ebl modversion predictable to allow build-compare (bnc#916043)
+
 -------------------------------------------------------------------
 Wed Jan  7 21:19:10 UTC 2015 - tonyj@suse.com
 

elfutils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package elfutils
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,8 @@ Patch5:         elfutils-0.137-dwarf-header-check-fix.diff
 Patch6:         elfutils-0.148-dont-crash.diff
 Patch7:         elfutils-fix-dir-traversal-vuln-in-ar-extraction.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libbz2-devel
@@ -156,10 +158,15 @@ modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
 find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
+# Set modversion used to verify dynamically loaded ebl backend matches to
+# similarly predictable value [upstream default is hostname + date]
+MODVERSION="suse-build `eval echo ${DATE} ${TIME}`"
+sed --in-place "s/^MODVERSION=.*\$/MODVERSION=\"${MODVERSION}\"/" configure.ac
 %ifarch %sparc
 # Small PIC model not sufficient
 export CFLAGS="%optflags -fPIC"
 %endif
+autoreconf -fi
 %configure --program-prefix=eu-
 make %{?_smp_mflags}