From ec1ced99e73c413d701b3055684e3eaa94479874ccc0bdcd3fcc3bbf37373ced Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 13 Mar 2008 18:09:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=25

---
 nautilus-config-defaults.patch | 30 ------------------------------
 nautilus.changes               |  5 +++++
 nautilus.spec                  |  7 +++----
 3 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 nautilus-config-defaults.patch

diff --git a/nautilus-config-defaults.patch b/nautilus-config-defaults.patch
deleted file mode 100644
index d21844f..0000000
--- a/nautilus-config-defaults.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -pruN nautilus-2.12.0-old/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.12.0/libnautilus-private/apps_nautilus_preferences.schemas.in
---- nautilus-2.12.0-old/libnautilus-private/apps_nautilus_preferences.schemas.in	2005-07-11 03:10:13.000000000 -0700
-+++ nautilus-2.12.0/libnautilus-private/apps_nautilus_preferences.schemas.in	2005-09-22 13:13:51.325688990 -0700
-@@ -43,7 +43,7 @@
-       <applyto>/apps/nautilus/preferences/always_use_browser</applyto>
-       <owner>nautilus</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-          <short>Enables the classic Nautilus behavior, where all windows are browsers</short>
-          <long>
-@@ -244,7 +244,7 @@
-       <applyto>/apps/nautilus/preferences/preview_sound</applyto>
-       <owner>nautilus</owner>
-       <type>string</type>
--      <default>local_only</default>
-+      <default>never</default>
-       <locale name="C">
-          <short>Whether to preview sounds when mousing over an icon</short>
-          <long>
-@@ -769,7 +769,7 @@ most cases, this should be left alone. -
-       <applyto>/apps/nautilus/desktop/computer_icon_visible</applyto>
-       <owner>nautilus</owner>
-       <type>bool</type>
--      <default>true</default>
-+      <default>false</default>
-       <locale name="C">
-          <short>Computer icon visible on desktop</short>
-          <long>
diff --git a/nautilus.changes b/nautilus.changes
index 62856df..aa073f6 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 13 18:37:14 CET 2008 - sbrabec@suse.cz
+
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
+
 -------------------------------------------------------------------
 Thu Mar 13 15:21:59 CET 2008 - vuntz@suse.de
 
diff --git a/nautilus.spec b/nautilus.spec
index b61d40d..53655bf 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -16,13 +16,11 @@ BuildRequires:  cdparanoia eel-devel fdupes gnome-common gnome-icon-theme gnome-
 License:        GPL v2 or later
 Group:          Productivity/File utilities
 Version:        2.22.0
-Release:        1
+Release:        2
 Summary:        The GNOME 2.x Desktop File Manager
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# PATCH-FIX-OPENSUSE nautilus-config-defaults.patch -- Default configuration
-Patch1:         nautilus-config-defaults.patch
 # PATCH-NEEDS-REBASE nautilus-name-length.patch
 Patch2:         nautilus-name-length.patch
 # PATCH-FIX-UPSTREAM nautilus-search-desktop.patch bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface
@@ -88,7 +86,6 @@ features of the Nautilus file manager.
 %prep
 %setup -q
 gnome-patch-translation-prepare
-%patch1 -p1
 #%patch2 -p0
 %if ! %sles_version
 %patch4
@@ -191,6 +188,8 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Mar 13 2008 sbrabec@suse.cz
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
 * Thu Mar 13 2008 vuntz@suse.de
 - Update to version 2.22.0:
   + Fix typo in strings