From 5e731820582dc4d746d17245769ae39106c5ff74cb3ce7170ddca7a13bdc83fc Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 10 Jan 2011 09:50:39 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/nautilus
 revision 90.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=2d9ea617349d0a2b83a363ab1c1ce3eb
---
 nautilus.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nautilus.spec b/nautilus.spec
index 9bc719f..948f523 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nautilus (Version 2.32.2.1)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From 2f16ef1a87a94fdaa0b61228daee8d9bef2d343d4695f7956f025efc53ada339 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sun, 13 Feb 2011 21:15:53 +0000
Subject: [PATCH 2/2] Accepting request 60823 from
 home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60823
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=123
---
 nautilus.changes | 15 +++++++++++++++
 nautilus.spec    | 16 ++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/nautilus.changes b/nautilus.changes
index 788c608..c38fd56 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:54:03 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+  + %icon_theme_cache_post/postun because the package ships themed
+    icons.
+  + %mime_database_post/postun because the package ships a mime
+    type definition.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+- Change Requires of lang subpackage to Recommends, since the
+  english documentation is not there anymore.
+
 -------------------------------------------------------------------
 Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org
 
diff --git a/nautilus.spec b/nautilus.spec
index 948f523..738a8af 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -74,9 +74,9 @@ BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(unique-1.0)
-Requires:       %{name}-lang = %{version}
 # So that symlinks to icons work:
 Requires:       gnome-icon-theme
+Recommends:     %{name}-lang
 Recommends:     gvfs
 Provides:       nautilus2 = %{version}
 Obsoletes:      nautilus2 < %{version}
@@ -159,7 +159,7 @@ test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop
 %{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop
 %suse_update_desktop_file mount-archive
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
 
@@ -169,18 +169,18 @@ rm -rf $RPM_BUILD_ROOT
 %pre -f %{name}.schemas_pre
 
 %post
-if test -x usr/bin/update-mime-database ; then
-    usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%desktop_database_post
+%icon_theme_cache_post
+%mime_database_post
 
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
 %postun
-if test -x usr/bin/update-mime-database ; then
-    usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%desktop_database_postun
+%icon_theme_cache_postun
+%mime_database_postun
 
 %post -n libnautilus-extension1 -p /sbin/ldconfig