From b9d9c6156ac01390ad5600e6df19246e6862ee7b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 29 Jun 2010 02:34:07 +0000
Subject: [PATCH] Update to 2.31.4

---
 .cvsignore    |  2 +-
 nautilus.spec | 23 ++++++-----------------
 sources       |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d0dabff..8647ed7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nautilus-2.31.3-20100618git.tar.gz
+nautilus-2.31.4.tar.bz2
diff --git a/nautilus.spec b/nautilus.spec
index eec1c25..a001e5f 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -11,15 +11,13 @@
 %define exempi_version 1.99.5
 %define gobject_introspection_version 0.6.4
 
-%define alphatag 20100618git
-
 Name:		nautilus
 Summary:        File manager for GNOME
-Version:	2.31.3
-Release:	4.%{alphatag}%{?dist}
+Version:	2.31.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:          User Interface/Desktops
-Source:		http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}-%{alphatag}.tar.gz
+Source:		http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.gz
 
 URL: 		http://projects.gnome.org/nautilus/
 Requires:	gamin
@@ -88,10 +86,6 @@ Patch10:        nautilus-gvfs-desktop-key-2.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-Patch18:        0001-build-link-against-gail-3.0-GNOME-bug-622155.patch
-Patch19:        nautilus-gir-deps.patch
-Patch20:        0001-Update-pkg-config-files-for-GTK-3.x.patch
-
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -130,9 +124,6 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .gail
-%patch19 -p1 -b .gir-deps
-%patch20 -p1 -b .pkg-config
 
 %build
 
@@ -165,8 +156,6 @@ for p in *.po; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
 LANG=en_US %makeinstall LIBTOOL=/usr/bin/libtool
@@ -202,9 +191,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0
 
 %find_lang %name
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
 %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
@@ -271,6 +257,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Mon Jun 28 2010 Matthias Clasen <mclasen@redhat.com> 2.31.4-1
+- Update to 2.31.4
+
 * Wed Jun 23 2010 Bastien Nocera <bnocera@redhat.com> 2.31.3-4.20100618git
 - Fix libnautilus-extensions pkg-config files
 
diff --git a/sources b/sources
index df536de..0b5b636 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37388b2cf3f7e28777fe1aff8e0b07c9  nautilus-2.31.3-20100618git.tar.gz
+2751d543984a6b859506c721719e7773  nautilus-2.31.4.tar.bz2