From bd35b5967b63e9d7e57688e70daeb44a4da0cac2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 5 Dec 2006 15:24:46 +0000
Subject: [PATCH] Cleanups

---
 gnome-vfs2.spec | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 4aeebc5..fe01c36 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -31,7 +31,7 @@ BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
-BuildRequires: /usr/bin/automake-1.9
+BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: intltool
 BuildRequires: autoconf
@@ -67,9 +67,6 @@ Patch6: gnome-vfs-2.15.91-mailto-command.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356772
 Patch8: gnome-vfs-2.16.0-no-dbus.patch
 
-# From upstream cvs
-Patch9: gnome-vfs-atexit-fix.patch
- 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -121,7 +118,6 @@ shares (SMB) to applications using GNOME VFS.
 %patch201 -p0 -b .console
 
 %patch8 -p1 -b .no-dbus
-%patch9 -p0 -b .gatexit-fix
 
 %build
 
@@ -130,17 +126,8 @@ if pkg-config openssl ; then
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 
-# auto* update needed for gnome-vfs-avahi.patch
-intltoolize --force
-libtoolize --force
-aclocal
-autoheader
-automake-1.9 --add-missing
-
-#needed for patch 102 (kerberos fix)
-autoconf
 CFLAGS="-O0 -g"
-%configure --disable-gtk-doc --with-gtk=no --enable-hal 
+%configure --disable-gtk-doc --enable-hal 
 
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool