diff --git a/rpm-suse_macros b/rpm-suse_macros index 4c8a0c3..7a23936 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -243,6 +243,7 @@ %sles_version @sles_version@ %ul_version @ul_version@ %is_opensuse @is_opensuse@ +%sle_version @sle_version@ %leap_version @leap_version@ %do_profiling 1 diff --git a/rpm.changes b/rpm.changes index fd477c5..b42e52c 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 11:43:36 CEST 2018 - mls@suse.de + +- Define sle_version in leap [bnc#1094735] + ------------------------------------------------------------------- Wed May 30 10:48:49 UTC 2018 - msuchanek@suse.com diff --git a/rpm.spec b/rpm.spec index 4d6a1ae..4198df3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -252,6 +252,12 @@ sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \ -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \ -e '/@leap_version@%{?leap_version:nomatch}/d' \ -e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \ +%if 0%{?is_opensuse} + -e '/@sle_version@%{?sle_version:nomatch}/d' \ + -e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \ +%else + -e '/@sle_version@/d' \ +%endif < %{SOURCE4} > suse_macros rm -f m4/libtool.m4 rm -f m4/lt*.m4