From e9267ab26b59c2609f00e9fa0f20fe88ab580f29 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 23 Jan 2017 09:22:39 -0500
Subject: [PATCH] Automated weekly systemtap rawhide release:
 0.20170123git100bca3

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

diff --git a/.gitignore b/.gitignore
index 3f3590b..99a2bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -219,3 +219,4 @@ systemtap-1.3.tar.gz
 /systemtap-3.1-0.20170116git3d13f4e.tar.gz
 /systemtap-3.1-0.20170116gitd5eac54.tar.gz
 /systemtap-3.1-0.20170116git8065f5d.tar.gz
+/systemtap-3.1-0.20170123git100bca3.tar.gz
diff --git a/sources b/sources
index 542ae92..e8240bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-3.1-0.20170116git8065f5d.tar.gz) = 63ccbefd556eb513d9cb8e5bf2c3c74d909c03eca04e8cd0b727c81fce902f03a918a3a8b4de51c2e608f82278694a174f0d1099a3a4d0f511bb4c68ef27a564
+SHA512 (systemtap-3.1-0.20170123git100bca3.tar.gz) = df823c8e473c721b824ddb36c9bde2378a611bb5d2419c5eb1567fec5626960279b9a75d911b23284f0367157fef95cad6c06236b8d265f0f0ee94f1d2bd19dd
diff --git a/systemtap.spec b/systemtap.spec
index e9da7fc..1d2ef6e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -72,7 +72,7 @@
 
 Name: systemtap
 Version: 3.1
-Release: 0.20170116git8065f5d%{?dist}
+Release: 0.20170123git100bca3%{?dist}
 # for version, see also configure.ac
 
 
@@ -107,7 +107,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20170116git8065f5d.tar.gz
+Source: %{name}-%{version}-0.20170123git100bca3.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -176,9 +176,11 @@ BuildRequires: ncurses-devel
 %endif
 %if %{with_python2_probes}
 BuildRequires: python-devel
+BuildRequires: python-setuptools
 %endif
 %if %{with_python3_probes}
 BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 %endif
 
 # Install requirements
@@ -983,6 +985,9 @@ done
 %{_emacs_sitestartdir}/systemtap-init.el
 %{_datadir}/vim/vimfiles/*/*.vim
 %endif
+# Notice that the stap-resolve-module-function.py file is used by
+# *both* the python2 and python3 subrpms.  Both subrpms use that same
+# python script to help list python probes.
 %if %{with_python3_probes} || %{with_python2_probes}
 %{_libexecdir}/systemtap/python/stap-resolve-module-function.py
 %exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
@@ -1090,10 +1095,6 @@ done
 %{_libexecdir}/systemtap/stapbm
 %endif
 
-# Notice we're putting one file, stap-resolve-module-function.py, into
-# *both* the python2 and python3 subrpms. This is OK as far as rpm is
-# concerned, since they are the same file. Both subrpms use that same
-# python script to help list python probes.
 %if %{with_python2_probes}
 %files runtime-python2
 %{python_sitearch}/HelperSDT
@@ -1133,6 +1134,10 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Mon Jan 23 2017 Lukas Berk <lberk@redhat.com> - 3.1-0.20170123git100bca3
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Jan 16 2017 Lukas Berk <lberk@redhat.com> - 3.1-0.20170116git8065f5d
 - Automated weekly rawhide release
 - Applied spec changes from upstream git