[packages/systemtap] - merge rpm5 fixes

[baggins]

commit 99214564f9c200904eb0248afa92ffc735df0b55
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 22 14:27:12 2021 +0100

    - merge rpm5 fixes

 systemtap-configure.patch    | 12 ------------
 systemtap-no-werror.patch    |  2 +-
 systemtap-rpm5-support.patch | 10 ++++++++++
 systemtap.spec               |  4 +---
 4 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/systemtap.spec b/systemtap.spec
index a75d726..3e77e77 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -26,7 +26,6 @@ Source0:	http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	7f80117649a9eb663781b5372e8a4f96
 Source1:	%{name}.tmpfiles
 Source2:	stap-server.tmpfiles
-Patch0:		%{name}-configure.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-rpm5-support.patch
 Patch3:		%{name}-no-werror.patch
@@ -284,7 +283,6 @@ Przewodniki i dokumentacja wprowadzająca do SystemTap.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %{?with_rpm5:%patch2 -p1}
 %patch3 -p1
@@ -299,7 +297,7 @@ find testsuite/systemtap.examples/ -name '*.stp' -print0 | xargs -0 \
 
 %build
 %{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
diff --git a/systemtap-configure.patch b/systemtap-configure.patch
deleted file mode 100644
index 13e9b3a..0000000
--- a/systemtap-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- systemtap-1.4/configure.ac~	2011-01-17 12:31:41.000000000 +0100
-+++ systemtap-1.4/configure.ac	2011-05-17 11:16:21.590000069 +0200
-@@ -548,6 +548,9 @@
-   AC_CHECK_HEADERS([elfutils/version.h])
- fi
- 
-+CPPFLAGS="${CPPFLAGS} -I/usr/include/rpm"
-+LIBS="${LIBS} -lrpmdb"
-+
- dnl This is here mainly to make sure that configure --prefix=... changes
- dnl the config.h files so files depending on it are recompiled
- dnl prefix is passed through indirectly in the Makefile.am AM_CPPFLAGS.
diff --git a/systemtap-no-werror.patch b/systemtap-no-werror.patch
index c5d94ff..24a852c 100644
--- a/systemtap-no-werror.patch
+++ b/systemtap-no-werror.patch
@@ -14,7 +14,7 @@
 --- systemtap-3.0/Makefile.am.orig	2016-04-05 20:44:51.275502703 +0200
 +++ systemtap-3.0/Makefile.am	2016-04-05 20:51:00.125487222 +0200
 @@ -14,8 +14,8 @@
- 	      -DLOCALEDIR='"$(localedir)"' \
+               -DPY3EXECDIR='"$(py3execdir)"' \
  	      -I$(srcdir)/includes -I$(builddir)/includes/sys
  
 -AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Werror -Wunused -Wformat=2 -W
diff --git a/systemtap-rpm5-support.patch b/systemtap-rpm5-support.patch
index e6d840d..0f2dca5 100644
--- a/systemtap-rpm5-support.patch
+++ b/systemtap-rpm5-support.patch
@@ -21,6 +21,16 @@ diff -dur systemtap-3.2.orig/configure.ac systemtap-3.2/configure.ac
    AC_CHECK_LIB(rpm, rpmtsInitIterator, [
                      AC_DEFINE([HAVE_LIBRPM],[1],[have librpm])
                      stap_LIBS="$stap_LIBS -lc -lrpm"
+@@ -548,6 +548,9 @@
+   AC_CHECK_HEADERS([elfutils/version.h])
+ fi
+ 
++CPPFLAGS="${CPPFLAGS} -I/usr/include/rpm"
++LIBS="${LIBS} -lrpmdb"
++
+ dnl This is here mainly to make sure that configure --prefix=... changes
+ dnl the config.h files so files depending on it are recompiled
+ dnl prefix is passed through indirectly in the Makefile.am AM_CPPFLAGS.
 diff -dur systemtap-3.2.orig/rpm_finder.cxx systemtap-3.2/rpm_finder.cxx
 --- systemtap-3.2.orig/rpm_finder.cxx	2017-10-18 19:59:37.000000000 +0200
 +++ systemtap-3.2/rpm_finder.cxx	2017-11-13 10:16:28.000000000 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemtap.git/commitdiff/99214564f9c200904eb0248afa92ffc735df0b55