From 4ebfb44ea4a359dd411dac22d7ab0723628aa0f2 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Sat, 29 Mar 2008 15:31:15 +0000
Subject: [PATCH] - Cosmetic fix of a testcase sanity breakpoint setting (part
 of BZ 233852).

---
 gdb-6.7-bz233852-attach-signalled-test.patch | 11 +++++++++--
 gdb.spec                                     |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gdb-6.7-bz233852-attach-signalled-test.patch b/gdb-6.7-bz233852-attach-signalled-test.patch
index 400005d..912ef32 100644
--- a/gdb-6.7-bz233852-attach-signalled-test.patch
+++ b/gdb-6.7-bz233852-attach-signalled-test.patch
@@ -3,6 +3,12 @@
 	* gdb.threads/attach-into-signal.c, gdb.threads/attach-into-signal.exp,
 	gdb.threads/attach-stopped.c, gdb.threads/attach-stopped.exp: New files.
 
+2008-03-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Bugreport by Petr Muller.
+	* gdb.threads/attach-stopped.exp: Fix the `Second sleep' breakpoint,
+	add there a comment.
+
 Formerly gdb-6.3-bz202705-attach-stop-20051011-race-fix-test.patch:
 	gdb.threads/attachstop-mt.exp, gdb.threads/attachstop-mt.c
 
@@ -321,7 +327,7 @@ diff -u -X /home/short/.diffi.list -ruNp gdb-6.5-unpatched/gdb/testsuite/gdb.thr
 diff -u -X /home/short/.diffi.list -ruNp gdb-6.5-unpatched/gdb/testsuite/gdb.threads/attach-stopped.exp gdb-6.5/gdb/testsuite/gdb.threads/attach-stopped.exp
 --- gdb-6.5-unpatched/gdb/testsuite/gdb.threads/attach-stopped.exp	1970-01-01 01:00:00.000000000 +0100
 +++ gdb-6.5/gdb/testsuite/gdb.threads/attach-stopped.exp	2008-01-09 15:26:30.000000000 +0100
-@@ -0,0 +1,221 @@
+@@ -0,0 +1,222 @@
 +# Copyright 2005-2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -467,7 +473,8 @@ diff -u -X /home/short/.diffi.list -ruNp gdb-6.5-unpatched/gdb/testsuite/gdb.thr
 +    } else {
 +	gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach2 to stopped bt"
 +    }
-+    gdb_breakpoint [gdb_get_line_number "$threadtype: Second sleep"]
++    # This breakpoint is there for old/non-x86 kernels not restarting syscalls.
++    gdb_breakpoint [gdb_get_line_number "Second sleep"]
 +    set test "$threadtype: attach2 continue"
 +    send_gdb "continue\n"
 +    gdb_expect {
diff --git a/gdb.spec b/gdb.spec
index aa17049..943023b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8
 
 # 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: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 1postcvs%{?_with_upstream:.upstream}%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -741,6 +741,9 @@ fi
 %{_mandir}/*/gdbserver.1*
 
 %changelog
+* Sat Mar 29 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-1postcvs
+- Cosmetic fix of a testcase sanity breakpoint setting (part of BZ 233852).
+
 * Fri Mar 28 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-1
 - Upgrade to the latest upstream final release gdb-6.8.