From 971e4e7e998549f6757404f276af5d3bcdb10b7d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 09:04:32 +0000 Subject: [PATCH] auto-import nautilus-2.0.6-2 from nautilus-2.0.6-2.src.rpm --- nautilus.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/nautilus.spec b/nautilus.spec index f27bff4..4ec387f 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -2,20 +2,21 @@ %define pango_version 1.0.99 %define gtk2_version 2.0.5 %define libgnomeui_version 2.0.0 -%define eel2_version 2.0.4 +%define eel2_version 2.0.6 %define libxml2_version 2.4.20 %define eog_version 1.0.0 %define gail_version 0.17-2 %define desktop_backgrounds_version 2.0-4 %define desktop_file_utils_version 0.2.90 %define gnome_desktop_version 2.0.5 -%define redhat_menus_version 0.16 -%define redhat_artwork_version 0.29 +%define redhat_menus_version 0.25 +%define redhat_artwork_version 0.41 +%define gnome_vfs2_version 2.0.2-5 Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.0.6 -Release: 1 +Release: 2 Copyright: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/%{name}-%{version}.tar.bz2 @@ -33,6 +34,8 @@ PreReq: scrollkeeper >= 0.1.4 Requires: desktop-backgrounds-basic >= %{desktop_backgrounds_version} Requires: redhat-menus >= %{redhat_menus_version} Requires: redhat-artwork >= %{redhat_artwork_version} +Requires: gnome-vfs2 >= %{gnome_vfs2_version} +Requires: eel2 >= %{eel2_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -42,6 +45,7 @@ BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: eel2-devel >= %{eel2_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} +BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} BuildRequires: fam-devel BuildRequires: librsvg2 BuildRequires: intltool @@ -65,11 +69,14 @@ Patch5: nautilus-2.0.5-left-margin.patch # owner, don't open new windows. Patch7: nautilus-2.0.5-disablemountwindow.patch Patch8: nautilus-2.0.6-cdloopback.patch +Patch9: nautilus-2.0.6-html-hack.patch # this patch is because libc had something wrong with it in # an early beta; safe to remove later. Patch31: nautilus-1.1.19-starthere-hang-hackaround.patch +Patch42: nautilus-2.0.6-triple-click.patch + %description Nautilus integrates access to files, applications, media, Internet-based resources and the Web. Nautilus delivers a dynamic and @@ -85,7 +92,9 @@ GNOME desktop project. %patch5 -p1 -b .left-margin %patch7 -p1 -b .disablemountwindow %patch8 -p0 -b .cdloopback +%patch9 -p1 -b .html-hack %patch31 -p1 -b .starthere-hang-hackaround +%patch42 -p1 -b .triple-click if test -f components/music/mpg123.c ; then echo "Must run %{SOURCE2} on upstream tarball prior to creating the SRPM" @@ -164,6 +173,12 @@ scrollkeeper-update %{_includedir}/libnautilus %changelog +* Sat Aug 31 2002 Havoc Pennington +- require newer redhat-artwork, -menus, eel2, gnome-vfs2 to avoid + bogus bug reports +- add hack for HTML mime type handling in a web browser, not + nautilus + * Thu Aug 29 2002 Alexander Larsson - Updated to 2.0.6. Removed the patches I put upstream. - Added patch that fixes #72410