From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 22 Feb 2021 12:36:18 +0000 (+0100)
Subject: - added rpm5 bcond
X-Git-Tag: auto/th/systemtap-3.3-6~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=cdb3985d20890677e79fbf63f807fde083b181dd;p=packages%2Fsystemtap.git

- added rpm5 bcond
- rel 6
---

diff --git a/systemtap.spec b/systemtap.spec
index 1a806f5..a75d726 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -7,6 +7,7 @@
 %bcond_without	java		# Java runtime support
 %bcond_without	python2		# Python 2.x runtime support
 %bcond_without	python3		# Python 3.x runtime support
+%bcond_with	rpm5	# build with rpm5
 
 %ifnarch %{ix86} %{x8664} x32 alpha arm ia64 ppc64 s390 s390x
 %undefine	with_crash
@@ -18,7 +19,7 @@ Summary:	Instrumentation System
 Summary(pl.UTF-8):	System oprzyrządowania
 Name:		systemtap
 Version:	3.3
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		Base
 Source0:	http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
@@ -285,14 +286,11 @@ Przewodniki i dokumentacja wprowadzająca do SystemTap.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%{?with_rpm5:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
-%if "%{_rpmversion}" >= "5.0"
-%patch2 -p1
-%endif
-
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
       testsuite/systemtap.examples/general/pyexample.py