From f76bde2ada717c3abb935acf3f4f5fc09f97456af38a733d939926b733f88bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Thu, 28 Nov 2013 10:41:40 +0000
Subject: [PATCH] Accepting request 208781 from home:Andreas_Schwab:Factory

- Substitute current values of %suse_release, %sles_release, %ul_release
  into suse_macros (bnc#851877)

OBS-URL: https://build.opensuse.org/request/show/208781
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=308
---
 rpm-suse_macros | 6 +++---
 rpm.changes     | 6 ++++++
 rpm.spec        | 8 ++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rpm-suse_macros b/rpm-suse_macros
index 5122975..71296ef 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -259,9 +259,9 @@
 %supplements_kernel_module() \
     %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
 
-%suse_version 1230
-%sles_version 0
-%ul_version 0
+%suse_version @suse_version@
+%sles_version @sles_version@
+%ul_version @ul_version@
 
 %do_profiling 1
 %cflags_profile_generate -fprofile-generate
diff --git a/rpm.changes b/rpm.changes
index 0ab5988..8bf85a4 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 28 08:08:55 UTC 2013 - schwab@suse.de
+
+- Substitute current values of %suse_release, %sles_release, %ul_release
+  into suse_macros (bnc#851877)
+
 -------------------------------------------------------------------
 Mon Nov 11 10:02:43 UTC 2013 - speilicke@suse.com
 
diff --git a/rpm.spec b/rpm.spec
index c182e91..bff84a8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -250,10 +250,10 @@ cp config.guess config.sub beecrypt/
 #chmod 755 scripts/debuginfo.prov
 tar -xjvf %{SOURCE1}
 tar -xjvf %{SOURCE2}
-if [ -s /etc/rpm/suse_macros ]; then
-	cp -a /etc/rpm/suse_macros %{SOURCE4}
-fi
-cp -a %{SOURCE4} suse_macros
+sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \
+    -e 's/@sles_version@/%{?sles_version}%{!?sles_version:0}/' \
+    -e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \
+  < %{SOURCE4} > suse_macros
 rm -f m4/libtool.m4
 rm -f m4/lt*.m4