From 4320c72b8c5d46830ed446d075a5736caa1fa02fd32a3ee15b9ffc14c03b4198 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 9 Apr 2010 11:18:06 +0000 Subject: [PATCH 1/3] Accepting request 37542 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 37542 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/37542 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=93 --- nautilus.changes | 6 ++++++ nautilus.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nautilus.changes b/nautilus.changes index 43a853a..459feb7 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 9 13:17:21 CEST 2010 - vuntz@opensuse.org + +- Change gvfs Requires to Recommends to avoid a build loop. Thanks + to Michael Meeks for finding this! + ------------------------------------------------------------------- Mon Mar 29 13:49:07 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index acb9711..aa0b591 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -57,9 +57,9 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff Requires: %{name}-lang = %{version} -Requires: gvfs # So that symlinks to icons work: Requires: gnome-desktop gnome-icon-theme +Recommends: gvfs Provides: nautilus2 = %{version} Obsoletes: nautilus2 < %{version} %gconf_schemas_prereq From 6143664f36c732772364a4dca5bd2c307ac331e4a602f2556515e09dd7acfb11 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 23:06:55 +0000 Subject: [PATCH 2/3] Accepting request 37543 from GNOME:Factory checked in (request 37543) OBS-URL: https://build.opensuse.org/request/show/37543 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=94 --- nautilus.changes | 6 ------ nautilus.spec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nautilus.changes b/nautilus.changes index 459feb7..43a853a 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Apr 9 13:17:21 CEST 2010 - vuntz@opensuse.org - -- Change gvfs Requires to Recommends to avoid a build loop. Thanks - to Michael Meeks for finding this! - ------------------------------------------------------------------- Mon Mar 29 13:49:07 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index aa0b591..acb9711 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -57,9 +57,9 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff Requires: %{name}-lang = %{version} +Requires: gvfs # So that symlinks to icons work: Requires: gnome-desktop gnome-icon-theme -Recommends: gvfs Provides: nautilus2 = %{version} Obsoletes: nautilus2 < %{version} %gconf_schemas_prereq From e6db54175584153a472a7555576a9767156bd34b97b7f4e7b8f25cb4f12dd50b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Apr 2010 23:06:56 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/nautilus revision 76.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=37af39738cd4f2b53a44461071a67fb0 --- nautilus.changes | 6 ++++++ nautilus.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nautilus.changes b/nautilus.changes index 43a853a..459feb7 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 9 13:17:21 CEST 2010 - vuntz@opensuse.org + +- Change gvfs Requires to Recommends to avoid a build loop. Thanks + to Michael Meeks for finding this! + ------------------------------------------------------------------- Mon Mar 29 13:49:07 CEST 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index acb9711..6d5ee72 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -36,7 +36,7 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities Version: 2.30.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 # fate#308344 bgo#602147 @@ -57,9 +57,9 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff Requires: %{name}-lang = %{version} -Requires: gvfs # So that symlinks to icons work: Requires: gnome-desktop gnome-icon-theme +Recommends: gvfs Provides: nautilus2 = %{version} Obsoletes: nautilus2 < %{version} %gconf_schemas_prereq