From 6313911b2abaca3a223e9951ddfe80be426a51db Mon Sep 17 00:00:00 2001
From: skasal <skasal@fedoraproject.org>
Date: Aug 09 2006 19:38:32 +0000
Subject: - New upstream version, incorporates both the patches.


---

diff --git a/.cvsignore b/.cvsignore
index 4051edb..e381b21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-frysk-0.0.1.2006.07.25.rh1.tar.bz2
+frysk-0.0.1.2006.08.09.rh1.tar.bz2
diff --git a/frysk.spec b/frysk.spec
index 0f5c784..747823e 100644
--- a/frysk.spec
+++ b/frysk.spec
@@ -1,16 +1,12 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.25.rh1
-Release:	4%{?dist}
+Version:	0.0.1.2006.08.09.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-# Disable the tests which fail:
-Patch0:		frysk-20060725-xfail.patch
-Patch1:		frysk-20060725-xfail-x86_64.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -29,11 +25,17 @@ BuildRequires:	libglade2-devel >= 2.5.1
 BuildRequires:	libgconf-java-devel
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
-BuildRequires:  dogtail >= 0.5.2
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
+BuildRequires:  dogtail >= 0.5.2
+
+# FIXME:
+# Needed by dogtail-run-headless; should be Required by dogtail:
+BuildRequires:	xorg-x11-xinit
+# Needed by "dogtail-run-headless -n":
+Buildrequires:	metacity
 
 ExclusiveArch: %{ix86} x86_64
 
@@ -47,10 +49,6 @@ process in the system.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%ifarch x86-64
-%patch1
-%endif
 
 %build 
 
@@ -110,6 +108,9 @@ rm -rf %{buildroot}
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Aug  9 2006 Stepan Kasal <skasal@redhat.com> - 0.0.1.2006.08.09.rh1-1
+- New upstream version, incorporates both the patches.
+
 * Wed Aug  2 2006 Stepan Kasal <skasal@redhat.com> - 0.0.1.2006.07.25.rh1-4
 - Add make check to %%check
 - Add patches to disable failing tests.
@@ -184,7 +185,7 @@ rm -rf %{buildroot}
 
 * Thu Jun 15 2006 Stepan Kasal <skasal@redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.
-- Patch to avoid scanf("%a[..]").
+- Patch to avoid scanf("%%a[..]").
 
 * Thu Jun 14 2006 Stepan Kasal <skasal@redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.
@@ -221,7 +222,7 @@ rm -rf %{buildroot}
 - Import frysk 0.0.1.2006.02.12.
 
 * Thu Feb 09 2006 Adam Jocksch <ajocksch@redhat.com> 0.0.1.2006.02.09-0.FC5.0
-- Removed ftrace from %files and added libexedir files and man pages.
+- Removed ftrace from %%files and added libexedir files and man pages.
 - Imported new frysk tarball, 
 
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.0.1.2006.01.22-0.FC5.1.1
@@ -266,7 +267,7 @@ rm -rf %{buildroot}
 
 * Wed Nov 10  2005 Igor Foox <ifoox@redhat.com> 0.0.0.20051109-0.1
 - Updated source, changed cdtparser dependency to eclipse-cdt. Added build
-restriction to i386. Added %{?_smp_flags} to make command.
+restriction to i386. Added %%{?_smp_flags} to make command.
 
 * Fri Oct 28  2005 Igor Foox <ifoox@redhat.com> 0.0-2
 - Validated all Requires and BuildRequires clauses, fixed some of them.
diff --git a/sources b/sources
index d7fa9b2..c5f6c61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68e9a2c795e6ea34f42e0375caf10c72  frysk-0.0.1.2006.07.25.rh1.tar.bz2
+c126b0790be2c8b95fede5d26b0b4cbb  frysk-0.0.1.2006.08.09.rh1.tar.bz2