From 4580a15cdaeb750b02f6ce46c24667ead8770205 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Mon, 18 Nov 2019 17:49:31 -0500
Subject: [PATCH] release 4.2

---
 .gitignore     |  2 +-
 sources        |  3 ++-
 systemtap.spec | 51 +++++++++-----------------------------------------
 3 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f1e263..5aa63e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*~
 /systemtap-3.1.tar.gz
 /systemtap-3.2-0.20170321git272146660f54.tar.gz
 /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz
@@ -36,3 +35,4 @@
 /systemtap-4.2-0.20190618git47c3f6c60174.tar.gz
 /systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz
 /systemtap-4.2-0.20190827git8ffab23ff.tar.gz
+/systemtap-4.2.tar.gz
diff --git a/sources b/sources
index ce404e1..ffcc854 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (systemtap-4.2-0.20190827git8ffab23ff.tar.gz) = 4b7a25c12ab5ef40718678639c104a6ace208ab3bd4572bfdaffcd65c6a36ee1b543e06a9720914dcb53b876f62f73f65d264b43f03b63dad03a535b8295e301
+SHA512 (systemtap-4.2.tar.gz) = 50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6
+
diff --git a/systemtap.spec b/systemtap.spec
index 0b4e83e..bc90c42 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -14,7 +14,7 @@
 %{!?elfutils_version: %global elfutils_version 0.142}
 %{!?pie_supported: %global pie_supported 1}
 %{!?with_boost: %global with_boost 0}
-%ifarch %{ix86} x86_64 ppc ppc64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
 %{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 %else
 %{!?with_dyninst: %global with_dyninst 0}
@@ -88,7 +88,7 @@
 
 Name: systemtap
 Version: 4.2
-Release: 0.20190828git8ffab23ff%{?dist}
+Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -122,7 +122,7 @@ Release: 0.20190828git8ffab23ff%{?dist}
 Summary: Programmable system-wide instrumentation system
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20190827git8ffab23ff.tar.gz
+Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
 # Build*
 BuildRequires: gcc-c++
@@ -131,7 +131,7 @@ BuildRequires: gettext-devel
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(avahi-client)
 %if %{with_dyninst}
-BuildRequires: dyninst-devel >= 8.0
+BuildRequires: dyninst-devel >= 10.0
 BuildRequires: pkgconfig(libselinux)
 %endif
 %if %{with_sqlite}
@@ -1266,47 +1266,14 @@ done
 
 # PRERELEASE
 %changelog
+* Mon Nov 18 2019 Sagar Patel <sapatel@redhat.com> - 4.2-1
+- Upstream release.
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.2-0.20190828git8ffab23ff
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
-* Tue Aug 27 2019 Aaron Merey <amerey@redhat.com> - 4.2-0.20190827git8ffab23ff
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Aug 27 2019 Aaron Merey <amerey@redhat.com> - 4.2-0.20190827git8ffab23ff
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.2-0.20190808gitebfc300ec2ad
-- Rebuilt for Python 3.8
-
-* Wed Aug 07 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190807gitebfc300ec2ad
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-0.20190619git47c3f6c60174
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 18 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190618git47c3f6c60174
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Jun 13 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190613git2d77f531a5d1
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Mon Jun 10 22:13:24 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2-0.20190606git8b868f3dd030
-- Rebuild for RPM 4.15
-
-* Mon Jun 10 15:42:06 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2-0.20190605git8b868f3dd030
-- Rebuild for RPM 4.15
-
-* Tue Jun 04 2019 Stan Cox <scox@redhat.com> - 4.2-0.20190604git8b868f3dd030
-- Rebuild for dyninst 10.1.0
-
-* Mon May 13 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-0.20190513git8b868f3dd030
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
+* Tue May 07 2019 Serguei Makarov <smakarov@redhat.com> - 4.1-1
+- Upstream release.
 
 * Tue May 07 2019 Serguei Makarov <smakarov@redhat.com> - 4.1-1
 - Upstream release.