From 9109ceda1585c0258e8da12e2933fab767cfca3b Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 23 Nov 2015 09:27:01 -0500
Subject: [PATCH] Automated weekly systemtap rawhide release:
 0.20151123gita344cab

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

diff --git a/.gitignore b/.gitignore
index 563d2c5..fa5b5bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,4 @@ systemtap-1.3.tar.gz
 /systemtap-3.0-0.20151102git6c9c5fc.tar.gz
 /systemtap-3.0-0.20151102git7b19719.tar.gz
 /systemtap-3.0-0.20151116gitcb69017.tar.gz
+/systemtap-3.0-0.20151123gita344cab.tar.gz
diff --git a/sources b/sources
index 17faf84..7463c1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-545e92341c1ec5300c426463d49c63f3  systemtap-3.0-0.20151116gitcb69017.tar.gz
+82cc9f0d4f4f914ff23ca32b645f348e  systemtap-3.0-0.20151123gita344cab.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index b9dc57d..bcfa0af 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,5 +1,6 @@
 %{!?with_sqlite: %global with_sqlite 1}
 %{!?with_docs: %global with_docs 1}
+%{!?with_monitor: %global with_monitor 1}
 # crash is not available
 %ifarch ppc ppc64 %{sparc} aarch64 ppc64le
 %{!?with_crash: %global with_crash 0}
@@ -58,7 +59,7 @@
 
 Name: systemtap
 Version: 3.0
-Release: 0.20151116gitcb69017%{?dist}
+Release: 0.20151123gita344cab%{?dist}
 # for version, see also configure.ac
 
 
@@ -91,7 +92,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20151116gitcb69017.tar.gz
+Source: %{name}-%{version}-0.20151123gita344cab.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,6 +106,9 @@ BuildRequires: libselinux-devel
 %if %{with_sqlite}
 BuildRequires: sqlite-devel
 %endif
+%if %{with_monitor}
+BuildRequires: json-c-devel ncurses-devel
+%endif
 # Needed for libstd++ < 4.0, without <tr1/memory>
 %if %{with_boost}
 BuildRequires: boost-devel
@@ -499,8 +503,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # %doc directive.
 mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
 
-# Fix paths in the example & testsuite scripts
-find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
+# Fix paths in the example scripts.
+find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
 
 # To make rpmlint happy, remove any .gitignore files in the testsuite.
 find testsuite -type f -name '.gitignore' -print0 | xargs -0 rm -f
@@ -1026,6 +1030,10 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Mon Nov 23 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151123gita344cab
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Nov 16 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151116gitcb69017
 - Automated weekly rawhide release