From f5846129f6d8adc09393e5c2eb282b47b4a81851214a0da72a2e532061070860 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Jun 2008 18:36:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=39 --- nautilus.changes | 5 +++++ nautilus.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nautilus.changes b/nautilus.changes index 4f7e9b9..3854fc2 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 27 17:24:42 CEST 2008 - maw@suse.de + +- Remove bogus symlinks (watch out for any missing icons). + ------------------------------------------------------------------- Fri Jun 20 18:09:05 CEST 2008 - maw@suse.de diff --git a/nautilus.spec b/nautilus.spec index bce4f51..453b6b5 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -16,7 +16,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gno License: GPL v2 or later Group: Productivity/File utilities Version: 2.23.4 -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 @@ -50,9 +50,10 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff Patch21: nautilus-bnc368446-network-in-places.patch # PATCH-FIX-UPSTREMA nautilus-bnc397852-huge-memory-leak.patch bnc397852 bgo536968 vuntz@novell.com Patch25: nautilus-bnc397852-huge-memory-leak.patch -Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs +# So that symlinks to icons work: +Requires: gnome-desktop gnome-icon-theme Provides: nautilus2 Obsoletes: nautilus2 AutoReqProv: on @@ -116,8 +117,11 @@ chmod -x COPYING %makeinstall rm $RPM_BUILD_ROOT/%{_libdir}/*.*a rm docs/Makefile* -ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -ln -s ../icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +# FIXME: this is probably wrong, but it enables the build to succeed for now +# ln -s ../icons/gnome/24x24/devices/gnome-computer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +### ln -s ../icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +# ln -s ../icons/gnome/24x24/places/gnome-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ %suse_update_desktop_file -N "Nautilus" -G "File Browser" nautilus System FileManager @@ -185,6 +189,8 @@ fi %{_datadir}/gtk-doc/html/libnautilus-extension %changelog +* Fri Jun 27 2008 maw@suse.de +- Remove bogus symlinks (watch out for any missing icons). * Fri Jun 20 2008 maw@suse.de - Update to version 2.23.4: + Support new gnome-session autostart semantics