From d836b982bbe10e3f104fe9edbf8fd28b62436c67 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Mon, 24 Oct 2022 22:54:12 +0300
Subject: [PATCH] systemtap ver. bump

---
 util/admin/systemtap/actions.py |  2 ++
 util/admin/systemtap/pspec.xml  | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/util/admin/systemtap/actions.py b/util/admin/systemtap/actions.py
index 0cbdc8e391..132c01f839 100644
--- a/util/admin/systemtap/actions.py
+++ b/util/admin/systemtap/actions.py
@@ -23,6 +23,7 @@ def setup():
                          --disable-publican \
                          --disable-crash \
                          --disable-silent-rules \
+                         --without-systemd \
                          --docdir=/%s/%s \
                          --without-rpm" % (get.docDIR(), get.srcNAME()))
 
@@ -43,6 +44,7 @@ def install():
     pisitools.dobin("stap-prep")
     pisitools.domove("/var/run/stap-server", "/run/")
     pisitools.removeDir("var/run")
+    pisitools.removeDir("/usr/lib/systemd")
 
     shelltools.copytree("testsuite", "%s/usr/share/systemtap" % get.installDIR())
 
diff --git a/util/admin/systemtap/pspec.xml b/util/admin/systemtap/pspec.xml
index eb6cd0790b..cf15e6f7e4 100644
--- a/util/admin/systemtap/pspec.xml
+++ b/util/admin/systemtap/pspec.xml
@@ -12,12 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>Instrumentation System</Summary>
         <Description>systemtap is an instrumentation system for systems running Linux 2.6. Developers can write instrumentation to collect data on the operation of the system.</Description>
-        <Archive sha1sum="efdb0d6e09ebdfa2acbfdb725542885db2195bb6" type="targz">https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz</Archive>
+        <Archive sha1sum="fc943fc3233b111fd80c9cbd063859dc1b699dcb" type="targz">https://sourceware.org/systemtap/ftp/releases/systemtap-4.7.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>bzip2</Dependency>
             <Dependency>nss-devel</Dependency>
             <Dependency>boost-devel</Dependency>
             <Dependency>python-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
             <Dependency>sqlite-devel</Dependency>
             <Dependency>json-c-devel</Dependency>
             <Dependency>ncurses-devel</Dependency>
@@ -25,6 +26,7 @@
             <Dependency>readline-devel</Dependency>
             <Dependency>elfutils-devel</Dependency>
             <Dependency>python-setuptools</Dependency>
+            <Dependency>python3-setuptools</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -39,10 +41,14 @@
             <Dependency>bzip2</Dependency>
             <Dependency>nspr</Dependency>
             <Dependency>nss</Dependency>
+            <Dependency>boost</Dependency>
+            <Dependency>json-c</Dependency>
+            <Dependency>ncurses</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
             <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -99,6 +105,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2022-10-24</Date>
+            <Version>4.7</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2020-02-02</Date>
             <Version>4.2</Version>