diff --git a/.gitignore b/.gitignore
index 5766f51..84ae916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/valgrind-3.9.0-svn20140829r14384.tar.bz2
/valgrind-3.10.0.BETA1.tar.bz2
/valgrind-3.10.0.BETA2.tar.bz2
+/valgrind-3.10.0.tar.bz2
diff --git a/sources b/sources
index 9cd67ba..70f4104 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-785115cf1a3f25afa8d0a97df6a1a879 valgrind-3.10.0.BETA2.tar.bz2
+7c311a72a20388aceced1aa5573ce970 valgrind-3.10.0.tar.bz2
diff --git a/valgrind-3.10-configure-glibc-2.20.patch b/valgrind-3.10-configure-glibc-2.20.patch
deleted file mode 100644
index aa61382..0000000
--- a/valgrind-3.10-configure-glibc-2.20.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Only in valgrind-3.10.0.BETA2: autom4te.cache
-diff -ur valgrind-3.10.0.BETA2.orig/config.h.in valgrind-3.10.0.BETA2/config.h.in
---- valgrind-3.10.0.BETA2.orig/config.h.in 2014-09-09 09:17:54.112654934 +0200
-+++ valgrind-3.10.0.BETA2/config.h.in 2014-09-09 09:35:38.000000000 +0200
-@@ -66,6 +66,9 @@
- /* Define to 1 if you're using glibc 2.2.x */
- #undef GLIBC_2_2
-
-+/* Define to 1 if you're using glibc 2.20.x */
-+#undef GLIBC_2_20
-+
- /* Define to 1 if you're using glibc 2.3.x */
- #undef GLIBC_2_3
-
-Only in valgrind-3.10.0.BETA2: config.h.in~
-diff -ur valgrind-3.10.0.BETA2.orig/configure valgrind-3.10.0.BETA2/configure
---- valgrind-3.10.0.BETA2.orig/configure 2014-09-09 09:17:54.106654950 +0200
-+++ valgrind-3.10.0.BETA2/configure 2014-09-09 09:35:43.280624261 +0200
-@@ -6828,6 +6828,16 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.20)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5
-+$as_echo "2.20 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_20 1" >>confdefs.h
-+
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
- darwin)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-diff -ur valgrind-3.10.0.BETA2.orig/configure.ac valgrind-3.10.0.BETA2/configure.ac
---- valgrind-3.10.0.BETA2.orig/configure.ac 2014-09-09 09:17:54.132654881 +0200
-+++ valgrind-3.10.0.BETA2/configure.ac 2014-09-09 09:33:31.944021414 +0200
-@@ -1008,6 +1008,13 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.20)
-+ AC_MSG_RESULT(2.20 family)
-+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
- darwin)
- AC_MSG_RESULT(Darwin)
- AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/valgrind.spec b/valgrind.spec
index 58c7abd..03ae49d 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
Summary: Tool for finding memory management bugs in programs
Name: %{?scl_prefix}valgrind
Version: 3.10.0
-Release: 0.2.BETA2%{?dist}
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
URL: http://www.valgrind.org/
@@ -33,8 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define _find_debuginfo_dwz_opts %{nil}
%undefine _include_minidebuginfo
-#Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Source0: valgrind-3.10.0.BETA2.tar.bz2
+Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
# Needs investigation and pushing upstream
Patch1: valgrind-3.9.0-cachegrind-improvements.patch
@@ -48,9 +47,6 @@ Patch3: valgrind-3.9.0-stat_h.patch
# Make ld.so supressions slightly less specific.
Patch4: valgrind-3.9.0-ldso-supp.patch
-# Recognize glibc 2.20 final. Upstream valgrind svn r14505.
-Patch5: valgrind-3.10-configure-glibc-2.20.patch
-
%if %{build_multilib}
# Ensure glibc{,-devel} is installed for both multilib arches
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -147,13 +143,12 @@ See the section on Debugging MPI Parallel Programs with Valgrind in the
Valgrind User Manual for details.
%prep
-%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.BETA2
+%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
# We need to use the software collection compiler and binutils if available.
@@ -306,6 +301,10 @@ echo ===============END TESTING===============
%endif
%changelog
+* Thu Sep 11 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-1
+- Update to 3.10.0 final.
+- Remove valgrind-3.10-configure-glibc-2.20.patch fixed upstream.
+
* Mon Sep 8 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-0.2.BETA2
- Update to 3.10.0.BETA2.
- Don't run dwz or generate minisymtab.