From 9b3091601d310f10bba65639c6762559987beaaa Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Nov 28 2016 14:13:13 +0000
Subject: Automated weekly systemtap rawhide release: 0.20161128git9ed4785


---

diff --git a/.gitignore b/.gitignore
index f161dcd..46650b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -209,3 +209,4 @@ systemtap-1.3.tar.gz
 /systemtap-3.1-0.20161107git3145b02.tar.gz
 /systemtap-3.1-0.20161114git5fb76b5.tar.gz
 /systemtap-3.1-0.20161121git09dd8f0.tar.gz
+/systemtap-3.1-0.20161128git9ed4785.tar.gz
diff --git a/sources b/sources
index c198199..df31f51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2f12a5c813bafcbe90dc2ad9517a148  systemtap-3.1-0.20161121git09dd8f0.tar.gz
+a2f9681e2a6bb3b7cea8b5aaef62183c  systemtap-3.1-0.20161128git9ed4785.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 9788e0e..711f64d 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -23,7 +23,7 @@
 %{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virtguest: %global with_virtguest 1}
-%{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
+%{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 6}
 %ifarch x86_64
 %{!?with_mokutil: %global with_mokutil 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 %{!?with_openssl: %global with_openssl 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
@@ -56,11 +56,21 @@
    %endif
 %endif
 
-%define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+   %define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
+%else
+   %define dracutstap %{_prefix}/share/dracut/modules.d/99stap
+%endif
+
+%if 0%{?rhel} >= 6
+    %define dracutbindir /sbin
+%else
+    %define dracutbindir %{_bindir}
+%endif
 
 Name: systemtap
 Version: 3.1
-Release: 0.20161121git09dd8f0%{?dist}
+Release: 0.20161128git9ed4785%{?dist}
 # for version, see also configure.ac
 
 
@@ -93,7 +103,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20161121git09dd8f0.tar.gz
+Source: %{name}-%{version}-0.20161128git9ed4785.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -490,7 +500,7 @@ cd ..
 %endif
 
 %if %{with_dracut}
-%global dracut_config --with-dracutstap=%{dracutstap}
+%global dracut_config --with-dracutstap=%{dracutstap} --with-dracutbindir=%{dracutbindir}
 %else
 %global dracut_config %{nil}
 %endif
@@ -618,6 +628,8 @@ done
 %if %{with_dracut}
    mkdir -p $RPM_BUILD_ROOT%{dracutstap}
    install -p -m 755 initscript/99stap/module-setup.sh $RPM_BUILD_ROOT%{dracutstap}
+   install -p -m 755 initscript/99stap/install $RPM_BUILD_ROOT%{dracutstap}
+   install -p -m 755 initscript/99stap/check $RPM_BUILD_ROOT%{dracutstap}
    install -p -m 755 initscript/99stap/start-staprun.sh $RPM_BUILD_ROOT%{dracutstap}
    touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
 %endif
@@ -1052,6 +1064,10 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Mon Nov 28 2016 Lukas Berk <lberk@redhat.com> - 3.1-0.20161128git9ed4785
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Nov 21 2016 Lukas Berk <lberk@redhat.com> - 3.1-0.20161121git09dd8f0
 - Automated weekly rawhide release