From 3a4041d93ed0471c5b48a6918affff3300e8f870 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Wed, 7 Aug 2019 09:39:21 -0400
Subject: [PATCH] Automated weekly systemtap rawhide release:
 0.20190807gitebfc300ec2ad

---
 .gitignore     |  1 +
 sources        |  2 +-
 systemtap.spec | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 639ef8e..35a5e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /systemtap-4.2-0.20190513git8b868f3dd030.tar.gz
 /systemtap-4.2-0.20190613git2d77f531a5d1.tar.gz
 /systemtap-4.2-0.20190618git47c3f6c60174.tar.gz
+/systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz
diff --git a/sources b/sources
index 4e28292..6498a8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.2-0.20190618git47c3f6c60174.tar.gz) = 7b75c920968887c69790ca2fe5e72c29a7357fedbdfbb8612ee8b099561fd042357f29e12eac0445dcb804ddc1f815eceddf374f8f897c11b327fe22ad7706ff
+SHA512 (systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz) = 378d8ba68809318c0a962dbbc2f98034f2396b87dd8bef4e5d81e98cba1aa8dc53e7b56ec2e8cc9a87a14c0d16b2921aaca6dfd63fc871fee3bab070015d3482
diff --git a/systemtap.spec b/systemtap.spec
index c3e4f73..342d792 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -38,6 +38,7 @@
 %{!?with_python2_probes: %global with_python2_probes (0%{?fedora} <= 28 && 0%{?rhel} <= 7)}
 %{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)}
 %{!?with_httpd: %global with_httpd 0}
+%{!?with_specific_python: %global with_specific_python 0%{?fedora} >= 31}
 
 # Virt is supported on these arches, even on el7, but it's not in core EL7
 %if 0%{?rhel} <= 7
@@ -87,7 +88,7 @@
 
 Name: systemtap
 Version: 4.2
-Release: 0.20190619git47c3f6c60174%{?dist}
+Release: 0.20190807gitebfc300ec2ad%{?dist}
 # for version, see also configure.ac
 
 
@@ -121,7 +122,7 @@ Release: 0.20190619git47c3f6c60174%{?dist}
 Summary: Programmable system-wide instrumentation system
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20190618git47c3f6c60174.tar.gz
+Source: %{name}-%{version}-0.20190807gitebfc300ec2ad.tar.gz
 
 # Build*
 BuildRequires: gcc-c++
@@ -203,6 +204,9 @@ BuildRequires: python-setuptools
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 %endif
+%if %{with_specific_python}
+BuildRequires: /usr/bin/pathfix.py
+%endif
 
 %if %{with_httpd}
 BuildRequires: libmicrohttpd-devel
@@ -423,6 +427,7 @@ URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: byteman > 2.0
 Requires: iproute
+Requires: java-devel
 
 %description runtime-java
 This package includes support files needed to run systemtap scripts
@@ -766,6 +771,11 @@ done
    touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
 %endif
 
+%if %{with_specific_python}
+# Some files got ambiguous python shebangs, we fix them after everything else is done
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch} %{buildroot}%{_bindir}/*
+%endif
+
 %pre runtime
 getent group stapusr >/dev/null || groupadd -f -g 156 -r stapusr
 getent group stapsys >/dev/null || groupadd -f -g 157 -r stapsys
@@ -1256,6 +1266,10 @@ done
 
 # PRERELEASE
 %changelog
+* Wed Aug 07 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190807gitebfc300ec2ad
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-0.20190619git47c3f6c60174
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild