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