rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix respawning in a loop when not showing the desktop

Browse Source
This commit is contained in:
Matthias Clasen 2009-03-12 15:02:46 +00:00
parent 6b15689a09
commit e05778b9f4
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nautilus-condrestart.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up nautilus-2.25.93/nautilus.desktop.in.condrestart nautilus-2.25.93/nautilus.desktop.in
--- nautilus-2.25.93/nautilus.desktop.in.condrestart 2009-03-12 10:49:41.449753624 -0400
+++ nautilus-2.25.93/nautilus.desktop.in 2009-03-12 10:49:51.814754208 -0400
@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
X-GNOME-Provides=filemanager
+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
diff -up nautilus-2.25.93/nautilus.desktop.in.in.condrestart nautilus-2.25.93/nautilus.desktop.in.in
--- nautilus-2.25.93/nautilus.desktop.in.in.condrestart 2009-03-12 10:47:41.681753834 -0400
+++ nautilus-2.25.93/nautilus.desktop.in.in 2009-03-12 10:49:29.663754303 -0400
@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
X-GNOME-Provides=filemanager
+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop

12
nautilus.spec
View File

@ -16,13 +16,13 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 2.25.93 Version: 2.25.93
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
URL: http://projects.gnome.org/nautilus/ URL: http://projects.gnome.org/nautilus/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gamin Requires: gamin
Requires: filesystem >= 2.1.1-1 Requires: filesystem >= 2.1.1-1
Requires: desktop-backgrounds-basic >= %{desktop_backgrounds_version} Requires: desktop-backgrounds-basic >= %{desktop_backgrounds_version}
@ -66,7 +66,7 @@ Obsoletes: nautilus-suggested
Obsoletes: nautilus-mozilla < 2.0 Obsoletes: nautilus-mozilla < 2.0
Obsoletes: nautilus-media Obsoletes: nautilus-media
Obsoletes: gnome-volume-manager < 2.24.0-2.fc10 Obsoletes: gnome-volume-manager < 2.24.0-2.fc10
# wait until 2009 to give people some time to port away # wait until 2009 to give people some time to port away
#Obsoletes: eel2 < 2.25.1-4.fc10 #Obsoletes: eel2 < 2.25.1-4.fc10
@ -90,6 +90,8 @@ Patch15: nautilus-2.22.0-treeview-xds-dnd-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch Patch17: nautilus-filetype-symlink-fix.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=571417
Patch18: nautilus-condrestart.patch
%description %description
Nautilus is the file manager and graphical shell for the GNOME desktop Nautilus is the file manager and graphical shell for the GNOME desktop
@ -129,6 +131,7 @@ for developing nautilus extensions.
%patch10 -p1 -b .gvfs-desktop-key %patch10 -p1 -b .gvfs-desktop-key
%patch15 -p1 -b .xds %patch15 -p1 -b .xds
%patch17 -p0 -b .symlink %patch17 -p0 -b .symlink
%patch18 -p1 -b .condrestart
%build %build
@ -261,6 +264,9 @@ fi
%changelog %changelog
* Thu Mar 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.93-2
- Avoid respawning in a loop when not showing the desktop (#485375)
* Wed Mar 11 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.93-1 * Wed Mar 11 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.93-1
- Update to 2.25.93 - Update to 2.25.93