From a69d34e2871740c08038143007c0d1c2641f30ed Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Fri, 28 Apr 2023 18:14:52 +0200
Subject: [PATCH] Upstream 3.21.0 final

---
 .gitignore    | 1 +
 sources       | 2 +-
 valgrind.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 710e60d..85a4432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /valgrind-3.20.0.tar.bz2
 /valgrind-3.21.0.RC1.tar.bz2
 /valgrind-3.21.0.RC2.tar.bz2
+/valgrind-3.21.0.tar.bz2
diff --git a/sources b/sources
index 5ff7d52..efed6a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (valgrind-3.21.0.RC2.tar.bz2) = 950f6fafdf49585cade5d7676343158e8fa22d246c657236c8adc33335c1d6bd1b4906099b5969a3484a8261eac1b8dda3183fb98edfc10afd7c07cd3ad493fb
+SHA512 (valgrind-3.21.0.tar.bz2) = 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
diff --git a/valgrind.spec b/valgrind.spec
index 9ccd89c..ddc7025 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
 Version: 3.21.0
-Release: 0.1.RC2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: https://www.valgrind.org/
@@ -69,7 +69,7 @@ URL: https://www.valgrind.org/
 # So those will already have their full symbol table.
 %undefine _include_minidebuginfo
 
-Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.RC2.tar.bz2
+Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2
 
 # Needs investigation and pushing upstream
 Patch1: valgrind-3.9.0-cachegrind-improvements.patch
@@ -209,7 +209,7 @@ Valgrind User Manual for details.
 %endif
 
 %prep
-%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.RC2
+%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}
 
 %patch1 -p1
 %patch2 -p1
@@ -448,6 +448,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 28 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-1
+- Upstream 3.21.0 final
+
 * Sat Apr 22 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.21.0-0.1.RC2
 - Upstream 3.21.0-RC2