From 7658807459a24b3d0b91fb7394158ebdd831c562b04042087f2d78bea7e5a82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 31 May 2016 12:02:53 +0000 Subject: [PATCH] - add is_opensuse and leap_version macros to suse_macros OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=374 --- rpm-suse_macros | 2 ++ rpm.changes | 6 ++++++ rpm.spec | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 55fc3ee..356c693 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -236,6 +236,8 @@ %suse_version @suse_version@ %sles_version @sles_version@ %ul_version @ul_version@ +%is_opensuse @is_opensuse@ +%leap_version @leap_version@ %do_profiling 1 %cflags_profile_generate -fprofile-generate diff --git a/rpm.changes b/rpm.changes index 2a16657..0992bcd 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 31 13:58:28 CEST 2016 - mls@suse.de + +- add is_opensuse and leap_version macros to suse_macros + [bnc#940315] + ------------------------------------------------------------------- Thu May 19 10:44:52 UTC 2016 - dimstar@opensuse.org diff --git a/rpm.spec b/rpm.spec index 05948f3..1517a28 100644 --- a/rpm.spec +++ b/rpm.spec @@ -203,7 +203,7 @@ Requires: file %description build If you want to build a rpm, you need this package. It provides rpmbuild -and requires some packages that are usually required +and requires some packages that are usually required. %prep %setup -q -n rpm-%{version} @@ -246,6 +246,10 @@ tar -xjvf %{SOURCE1} 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}/' \ + -e '/@is_opensuse@%{?is_opensuse:nomatch}/d' \ + -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}/' \ < %{SOURCE4} > suse_macros rm -f m4/libtool.m4 rm -f m4/lt*.m4