rpms/nautilus/devel .cvsignore, 1.102, 1.103 nautilus-gvfs-desktop-key-2.patch, 1.3, 1.4 nautilus.spec, 1.296, 1.297 sources, 1.108, 1.109 nautilus-2.28.0-revert-bg-fade-break.patch, 1.1, NONE nautilus-2.29.xx-nautilus-directory-leak.patch, 1.1, NONE nautilus-monitor-change.patch, 1.2, NONE

Tomas Bzatek tbzatek at fedoraproject.org
Fri Dec 18 11:00:42 UTC 2009


Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29979

Modified Files:
	.cvsignore nautilus-gvfs-desktop-key-2.patch nautilus.spec 
	sources 
Removed Files:
	nautilus-2.28.0-revert-bg-fade-break.patch 
	nautilus-2.29.xx-nautilus-directory-leak.patch 
	nautilus-monitor-change.patch 
Log Message:
* Fri Dec 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.1-1
- Update to 2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	2 Nov 2009 16:33:11 -0000	1.102
+++ .cvsignore	18 Dec 2009 11:00:42 -0000	1.103
@@ -1 +1 @@
-nautilus-2.28.1.tar.bz2
+nautilus-2.29.1.tar.bz2

nautilus-gvfs-desktop-key-2.patch:
 data/nautilus-autorun-software.desktop.in              |    1 +
 data/nautilus-autorun-software.desktop.in.in           |    1 +
 data/nautilus-browser.desktop.in                       |    1 +
 data/nautilus-browser.desktop.in.in                    |    1 +
 data/nautilus-computer.desktop.in                      |    1 +
 data/nautilus-computer.desktop.in.in                   |    1 +
 data/nautilus-file-management-properties.desktop.in    |    1 +
 data/nautilus-file-management-properties.desktop.in.in |    1 +
 data/nautilus-folder-handler.desktop.in                |    1 +
 data/nautilus-folder-handler.desktop.in.in             |    1 +
 data/nautilus-home.desktop.in                          |    1 +
 data/nautilus-home.desktop.in.in                       |    1 +
 data/nautilus.desktop                                  |    1 +
 data/nautilus.desktop.in                               |    1 +
 data/nautilus.desktop.in.in                            |    1 +
 src/network-scheme.desktop.in                          |    1 +
 16 files changed, 16 insertions(+)

Index: nautilus-gvfs-desktop-key-2.patch
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus-gvfs-desktop-key-2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nautilus-gvfs-desktop-key-2.patch	5 May 2009 12:17:42 -0000	1.3
+++ nautilus-gvfs-desktop-key-2.patch	18 Dec 2009 11:00:42 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in
---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in
+--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Autorun Prompt
  TryExec=nautilus-autorun-software
  Exec=nautilus-autorun-software %u
@@ -9,10 +9,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=application-x-executable
  NoDisplay=true
  Terminal=false
-diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in
---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Autorun Prompt
  TryExec=nautilus-autorun-software
  Exec=nautilus-autorun-software %u
@@ -20,10 +20,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=application-x-executable
  NoDisplay=true
  Terminal=false
-diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in.in
---- nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key	2008-10-02 14:26:49.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-browser.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=File Browser
+diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in
+--- nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-browser.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=File Browser
  _Comment=Browse the file system with the file manager
  TryExec=nautilus
  Exec=nautilus --no-desktop --browser %U
@@ -31,10 +31,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in
---- nautilus-2.25.91/data/nautilus-browser.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-browser.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=File Browser
+diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-browser.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=File Browser
  _Comment=Browse the file system with the file manager
  TryExec=nautilus
  Exec=nautilus --no-desktop --browser %U
@@ -42,10 +42,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in.in
---- nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-computer.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Computer
+diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in
+--- nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-computer.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Computer
  _Comment=Browse all local and remote disks and folders accessible from this computer
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
@@ -53,10 +53,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=computer
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in
---- nautilus-2.25.91/data/nautilus-computer.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-computer.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Computer
+diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-computer.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Computer
  _Comment=Browse all local and remote disks and folders accessible from this computer
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
@@ -64,43 +64,43 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=computer
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus.desktop.in.in.key nautilus-2.25.91/data/nautilus.desktop.in.in
---- nautilus-2.25.91/data/nautilus.desktop.in.in.key	2009-02-02 13:28:32.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -2,6 +2,7 @@
- Encoding=UTF-8
- _Name=File Manager
+diff -up nautilus-2.29.1/data/nautilus.desktop.desktop-key nautilus-2.29.1/data/nautilus.desktop
+--- nautilus-2.29.1/data/nautilus.desktop.desktop-key	2009-12-17 17:18:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop	2009-12-18 11:08:58.000000000 +0100
+@@ -100,6 +100,7 @@ Name[zh_HK]=檔案管理程式
+ Name[zh_TW]=檔案管理程式
+ Name[zu]=Mphathi Hele
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus.desktop.in.key nautilus-2.25.91/data/nautilus.desktop.in
---- nautilus-2.25.91/data/nautilus.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -2,6 +2,7 @@
- Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus.desktop.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in
+--- nautilus-2.29.1/data/nautilus.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
  _Name=File Manager
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautilus.desktop
---- nautilus-2.25.91/data/nautilus.desktop.key	2009-02-16 14:56:33.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop	2009-02-16 17:24:49.000000000 +0100
-@@ -97,6 +97,7 @@ Name[zh_HK]=檔案管理程式
- Name[zh_TW]=檔案管理程式
- Name[zu]=Mphathi Hele
+diff -up nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in.in
+--- nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ _Name=File Manager
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in
---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in
+--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=File Management
  _Comment=Change the behaviour and appearance of file manager windows
  Exec=nautilus-file-management-properties
@@ -108,10 +108,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in
---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=File Management
  _Comment=Change the behaviour and appearance of file manager windows
  Exec=nautilus-file-management-properties
@@ -119,10 +119,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in
---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in
+--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Open Folder
  TryExec=nautilus
  Exec=nautilus --no-desktop %U
@@ -130,10 +130,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  NoDisplay=true
  Terminal=false
  Icon=folder-open
-diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in
---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Open Folder
  TryExec=nautilus
  Exec=nautilus --no-desktop %U
@@ -141,10 +141,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  NoDisplay=true
  Terminal=false
  Icon=folder-open
-diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/data/nautilus-home.desktop.in.in
---- nautilus-2.25.91/data/nautilus-home.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-home.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Home Folder
+diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in
+--- nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-home.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Home Folder
  _Comment=Open your personal folder
  TryExec=nautilus
  Exec=nautilus --no-desktop
@@ -152,10 +152,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=user-home
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/data/nautilus-home.desktop.in
---- nautilus-2.25.91/data/nautilus-home.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-home.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Home Folder
+diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-home.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Home Folder
  _Comment=Open your personal folder
  TryExec=nautilus
  Exec=nautilus --no-desktop
@@ -163,10 +163,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=user-home
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/src/network-scheme.desktop.in.key nautilus-2.25.91/src/network-scheme.desktop.in
---- nautilus-2.25.91/src/network-scheme.desktop.in.key	2008-09-14 14:14:22.000000000 +0200
-+++ nautilus-2.25.91/src/network-scheme.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Network
+diff -up nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key nautilus-2.29.1/src/network-scheme.desktop.in
+--- nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/src/network-scheme.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Network
  _Comment=Browse bookmarked and local network locations
  TryExec=nautilus
  Exec=nautilus --no-desktop network:


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- nautilus.spec	10 Dec 2009 23:54:49 -0000	1.296
+++ nautilus.spec	18 Dec 2009 11:00:42 -0000	1.297
@@ -4,7 +4,7 @@
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.29.3-2
+%define gnome_desktop_version 2.29.4
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -14,11 +14,11 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.28.2
-Release:	3%{?dist}
+Version: 	2.29.1
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 
 URL: 		http://projects.gnome.org/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,6 @@ Requires:       libexif >= %{libexif_ver
 %ifnarch s390 s390x
 Requires: 	eject
 %endif
-PreReq:    scrollkeeper >= 0.1.4
 
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:	pango-devel >= %{pango_version}
@@ -60,6 +59,9 @@ Requires(pre): GConf2 >= %{gconf_version
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires:	gnome-desktop >= %{gnome_desktop_version}
+Requires(pre):    scrollkeeper
+Requires(post):   scrollkeeper
+Requires(postun): scrollkeeper
 
 Obsoletes:      nautilus-extras
 Obsoletes:      nautilus-suggested
@@ -82,19 +84,11 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
-# from upstream
-Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
-
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# Need to file upstream and investigate a real fix
-Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=147808
-Patch20:	nautilus-monitor-change.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -130,11 +124,8 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
-%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .revert-bg-fade-break
-%patch20 -p1 -b .nautilus-monitor-change
 
 %build
 
@@ -270,6 +261,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.1-1
+- Update to 2.29.1
+
 * Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.2-3
 - Update the monitor changes patch (gnome #147808)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	1 Dec 2009 11:10:02 -0000	1.108
+++ sources	18 Dec 2009 11:00:42 -0000	1.109
@@ -1 +1 @@
-872ac5a2b875a85473266aa540926596  nautilus-2.28.2.tar.bz2
+d3bb9044b7900bb19a9cbbe0631246bd  nautilus-2.29.1.tar.bz2


--- nautilus-2.28.0-revert-bg-fade-break.patch DELETED ---


--- nautilus-2.29.xx-nautilus-directory-leak.patch DELETED ---


--- nautilus-monitor-change.patch DELETED ---




More information about the fedora-extras-commits mailing list