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

@@ -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
 

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