diff --git a/nautilus.changes b/nautilus.changes index 769a5b2..4125aba 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 8 21:26:59 CEST 2010 - vuntz@opensuse.org - -- Remove unneeded gnome-desktop Requires: there's no reason for it. - -------------------------------------------------------------------- -Wed Sep 8 01:32:48 CEST 2010 - vuntz@opensuse.org - -- Add libselinux-devel BuildRequires to build with SELinux support. -- Change old-style BuildRequires to pkgconfig() style - BuildRequires: - + old-style: gnome-desktop-devel, libexif-devel, libxml2-devel. - + new-style: gail, gconf-2.0, glib-2.0, gnome-desktop-2.0, - gtk+-2.0, libexif, libxml-2.0, pango. -- This will make it easier to switch to GNOME 3 libraries. - -------------------------------------------------------------------- -Mon Sep 6 14:01:30 CEST 2010 - vuntz@opensuse.org - -- Do not add unneeded categories to - nautilus-file-management-properties.desktop, especially since - they make the item appear twice in the menus. - ------------------------------------------------------------------- Wed Aug 18 15:45:51 CEST 2010 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 772a194..3d7a65e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -20,11 +20,31 @@ %define use_tracker 0%{suse_version} >= 1130 Name: nautilus +BuildRequires: fdupes +BuildRequires: gnome-common +BuildRequires: gnome-desktop-devel +BuildRequires: gnome-icon-theme +BuildRequires: gnome-patch-translation +BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc +BuildRequires: intltool +BuildRequires: libexempi-devel +BuildRequires: libexif-devel +BuildRequires: libxml2-devel +# nautilus doesn't need the BuildRequires to build its modules for tracker and +# beagle. But we keep this below for reference -- it's commented out to avoid +# build loops. +#%if %use_tracker +#BuildRequires: tracker-devel +#%else +#BuildRequires: libbeagle-devel +#%endif +BuildRequires: translation-update-upstream +BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities Version: 2.31.90 Release: 1 -# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in # FIXME: Check if the sed hacks for DEPRECATED symbols are still needed Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -49,36 +69,9 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff Patch21: nautilus-sysadmin-desktop-items.diff # PATCH-FIX-UPSTREAM nautilus-boot-order.patch bgo#619841 sshaw@decriptor.com -- From SLED w/o sreadahead. Delays applets Patch22: nautilus-boot-order.patch -BuildRequires: fdupes -BuildRequires: gnome-common -BuildRequires: gnome-icon-theme -BuildRequires: gnome-patch-translation -BuildRequires: gobject-introspection-devel -BuildRequires: gtk-doc -BuildRequires: intltool -BuildRequires: libexempi-devel -BuildRequires: libselinux-devel -# nautilus doesn't need the BuildRequires to build its modules for tracker and -# beagle. But we keep this below for reference -- it's commented out to avoid -# build loops. -#%if %use_tracker -#BuildRequires: tracker-devel -#%else -#BuildRequires: libbeagle-devel -#%endif -BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gail) -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libexif) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(pango) Requires: %{name}-lang = %{version} # So that symlinks to icons work: -Requires: gnome-icon-theme +Requires: gnome-desktop gnome-icon-theme Recommends: gvfs Provides: nautilus2 = %{version} Obsoletes: nautilus2 < %{version} @@ -156,7 +149,7 @@ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixm %suse_update_desktop_file nautilus-autorun-software %suse_update_desktop_file nautilus-browser %suse_update_desktop_file nautilus-computer -%suse_update_desktop_file nautilus-file-management-properties +%suse_update_desktop_file nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file nautilus-folder-handler %suse_update_desktop_file nautilus-home %suse_update_desktop_file nautilus-search