From 82b9074876d6c9ecd3324034c03f976ce8695f11 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Mon, 22 Sep 2008 00:24:40 +0000
Subject: [PATCH] - Fix build error due to a `dprintf' conflict on recent
 glibc. - New rpmbuild parameter: --without check

---
 libunwind-snap-070224-dprintf-vs-stdio.h | 15 +++++++++++++++
 libunwind.spec                           | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 libunwind-snap-070224-dprintf-vs-stdio.h

diff --git a/libunwind-snap-070224-dprintf-vs-stdio.h b/libunwind-snap-070224-dprintf-vs-stdio.h
new file mode 100644
index 0000000..2fd0880
--- /dev/null
+++ b/libunwind-snap-070224-dprintf-vs-stdio.h
@@ -0,0 +1,15 @@
+--- libunwind-0.99-alpha-orig/include/libunwind_i.h	2006-07-28 05:30:50.000000000 +0200
++++ libunwind-0.99-alpha/include/libunwind_i.h	2008-09-22 01:53:04.000000000 +0200
+@@ -238,11 +238,11 @@ extern int unwi_dyn_validate_cache (unw_
+ extern unw_dyn_info_list_t _U_dyn_info_list;
+ extern pthread_mutex_t _U_dyn_info_list_lock;
+ 
++#include <stdio.h>
+ #if UNW_DEBUG
+ #define unwi_debug_level		UNWI_ARCH_OBJ(debug_level)
+ extern long unwi_debug_level;
+ 
+-# include <stdio.h>
+ # define Debug(level,format...)						\
+ do {									\
+   if (unwi_debug_level >= level)					\
diff --git a/libunwind.spec b/libunwind.spec
index 2e240b5..41fd91e 100644
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -1,3 +1,6 @@
+# rpmbuild parameters:
+# --without check: Do not run the testsuite.  Default is to run it.
+
 # Define this if you want to skip the strip step and preserve debug info.
 # Useful for testing. 
 #define __debug_install_post : > %{_builddir}/%{?buildsubdir}/debugfiles.list
@@ -8,13 +11,14 @@ Name: libunwind
 Version: 0.99
 %define frysksnap 20070405cvs
 %define upstreamsnap 070224
-Release: 0.5.frysk%{frysksnap}%{?dist}
+Release: 0.6.frysk%{frysksnap}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
 Patch1: libunwind-snap-%{upstreamsnap}-frysk%{frysksnap}.patch
 Patch2: libunwind-snap-070224-orphanripper.patch
 Patch3: libunwind-snap-070224-multilib-rh342451.patch
+Patch4: libunwind-snap-070224-dprintf-vs-stdio.h
 Source1: libunwind-orphanripper.c
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://savannah.nongnu.org/projects/libunwind
@@ -48,6 +52,7 @@ chmod +x tests/run-ptrace-signull
 cp -p %{SOURCE1} tests/orphanripper.c
 
 %patch3 -p1 -E
+%patch4 -p1 -E
 
 %build
 mkdir -p config
@@ -64,7 +69,13 @@ make
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libunwind*.la
 
 %check
+%if 0%{?_without_check:1} || 0%{?_without_testsuite:1}
+echo ====================TESTSUITE DISABLED=========================
+%else
+echo ====================TESTING=========================
 make check || true
+echo ====================TESTING END=====================
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Mon Sep 22 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 0.99-0.6.frysk20070405cvs
+- Fix build error due to a `dprintf' conflict on recent glibc.
+- New rpmbuild parameter: --without check
+
 * Sun Feb 24 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 0.99-0.5.frysk20070405cvs
 - Fix the multilib conflicts (BZ 342451).