diff --git a/gdb-6.3-test-dtorfix-20050121.patch b/gdb-6.3-test-dtorfix-20050121.patch
index b19e037..bcc4565 100644
--- a/gdb-6.3-test-dtorfix-20050121.patch
+++ b/gdb-6.3-test-dtorfix-20050121.patch
@@ -235,10 +235,11 @@ Index: gdb/testsuite/ChangeLog
 +gdb_load ${binfile}
 +runto_main
 +
++set first_line_dtor [gdb_get_line_number "First line ~C"]
 +set define_line_dtor [gdb_get_line_number "Destructor C"]
 +# Break on the various forms of the C::~C destructor
 +# " ([23] locations)" is displayed depending on G++ version.
-+gdb_test "break C\:\:~C" "Breakpoint .*, line $define_line_dtor\\..*" "breaking on C::~C"
++gdb_test "break C\:\:~C" "Breakpoint .*, line ($define_line_dtor|$define_line_dtor)\\..*" "breaking on C::~C"
 +gdb_continue_to_breakpoint "First line ~C"
 +
 +# Verify that we can break by line number in a destructor and find
@@ -247,7 +248,6 @@ Index: gdb/testsuite/ChangeLog
 +gdb_load ${binfile}
 +delete_breakpoints
 +
-+set first_line_dtor [gdb_get_line_number "First line ~C"]
 +# " (3 locations)" is displayed depending on G++ version.
 +gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor\\..*" "break by line in destructor"
 +
diff --git a/gdb.spec b/gdb.spec
index f2850de..2fe016b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -36,7 +36,7 @@ Version: 7.0.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 18%{?_with_upstream:.upstream}%{dist}
+Release: 19%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -1002,6 +1002,9 @@ fi
 %endif
 
 %changelog
+* Sun Jan  3 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.1-19.fc12
+- testsuite: Fixup false FAILs for gdb.cp/constructortest.exp.
+
 * Sat Jan  2 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.1-18.fc12
 - Fix regression of gdb-7.0 (from 6.8) crashing on typedefed bitfields.
 - Fix related_breakpoint stale ref crash.