From fd1090028b3d0c3ac51e59c054350b445db285ccd27dec5e6b912c88ab96935d Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 11 Feb 2010 00:32:34 +0000
Subject: [PATCH] Accepting request 32085 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 32085 revision 3.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/32085
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=82
---
 nautilus-2.29.2.tar.bz2  |  3 ---
 nautilus-2.29.90.tar.bz2 |  3 +++
 nautilus.changes         |  8 ++++++++
 nautilus.spec            | 12 ++++++------
 4 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 nautilus-2.29.2.tar.bz2
 create mode 100644 nautilus-2.29.90.tar.bz2

diff --git a/nautilus-2.29.2.tar.bz2 b/nautilus-2.29.2.tar.bz2
deleted file mode 100644
index 3558a43..0000000
--- a/nautilus-2.29.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fc9b2168d6abf9c7c154feab08672d0f3a3e16316a49e8b8aaf1dbc8361d0d1
-size 6122878
diff --git a/nautilus-2.29.90.tar.bz2 b/nautilus-2.29.90.tar.bz2
new file mode 100644
index 0000000..8d5afff
--- /dev/null
+++ b/nautilus-2.29.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c62ec7c135353200457ecb7b2c11809b08d5743c973cd29cd471386ad7f15de
+size 6137907
diff --git a/nautilus.changes b/nautilus.changes
index 00d208b..37a7f16 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 10 16:30:20 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.29.90:
+  + Fix copy-pasted tooltip string
+  + Translation updates
+- Fix self-obsoletion of nautilus2 and nautilus2-devel.
+
 -------------------------------------------------------------------
 Mon Feb  1 12:05:01 UTC 2010 - jengelh@medozas.de
 
diff --git a/nautilus.spec b/nautilus.spec
index 16fedc1..9281c6a 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package nautilus (Version 2.29.2)
+# spec file for package nautilus (Version 2.29.90)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -35,7 +35,7 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 License:        GPLv2+
 Group:          Productivity/File utilities
-Version:        2.29.2
+Version:        2.29.90
 Release:        1
 Summary:        The GNOME 2.x Desktop File Manager
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
@@ -58,8 +58,8 @@ Requires:       %{name}-lang = %{version}
 Requires:       gvfs
 # So that symlinks to icons work:
 Requires:       gnome-desktop gnome-icon-theme
-Provides:       nautilus2
-Obsoletes:      nautilus2
+Provides:       nautilus2 = %{version}
+Obsoletes:      nautilus2 < %{version}
 %gconf_schemas_prereq
 
 %description
@@ -73,8 +73,8 @@ License:        GPLv2+
 Summary:        Development Package for Nautilus
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version} glib2-devel gtk2-devel
-Provides:       nautilus2-devel
-Obsoletes:      nautilus2-devel
+Provides:       nautilus2-devel = %{version}
+Obsoletes:      nautilus2-devel < %{version}
 
 %description devel 
 This package contains all files needed to develop programs that use