From 94b81151cb4d6a3cbc7402446d65f08353139afeeb79f3307bbd8d97277ba3e1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 19 Feb 2011 20:58:08 +0000 Subject: [PATCH 1/6] Accepting request 62163 from home:vuntz:branches:GNOME:Factory Looks good... now we need to hope this get's into 11.4... and we need tracker 0.10 :) OBS-URL: https://build.opensuse.org/request/show/62163 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=125 --- nautilus-tracker-0.10.patch | 22 ++++++++++++++++++++++ nautilus.changes | 6 ++++++ nautilus.spec | 7 +++++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 nautilus-tracker-0.10.patch diff --git a/nautilus-tracker-0.10.patch b/nautilus-tracker-0.10.patch new file mode 100644 index 0000000..59690c1 --- /dev/null +++ b/nautilus-tracker-0.10.patch @@ -0,0 +1,22 @@ +Index: nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c +=================================================================== +--- nautilus-2.32.2.orig/libnautilus-private/nautilus-search-engine-tracker.c ++++ nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c +@@ -122,10 +122,16 @@ open_libtracker (void) + done = TRUE; + flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL; + +- tracker = g_module_open ("libtracker-client-0.8.so.0", flags); ++ tracker = g_module_open ("libtracker-client-0.10.so.0", flags); ++ /* we use the same API as in 0.8 */ + version = TRACKER_0_8; + + if (!tracker) { ++ tracker = g_module_open ("libtracker-client-0.8.so.0", flags); ++ version = TRACKER_0_8; ++ } ++ ++ if (!tracker) { + tracker = g_module_open ("libtracker-client-0.7.so.0", flags); + + if (tracker && !g_module_symbol (tracker, "tracker_resources_sparql_query_async", &x)) { diff --git a/nautilus.changes b/nautilus.changes index c38fd56..9e00d97 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 19 18:13:23 CET 2011 - vuntz@opensuse.org + +- Add nautilus-tracker-0.10.patch: add support for tracker 0.10. + Without it, a search will be very expensive. + ------------------------------------------------------------------- Sun Feb 13 16:54:03 CET 2011 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 738a8af..6984599 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.32.2.1) +# spec file for package nautilus # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities Version: 2.32.2.1 -Release: 1 +Release: 2 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -46,6 +46,8 @@ 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 +# PATCH-FIX-UPSTREAM nautilus-tracker-0.10.patch bgo#642770 vuntz@opensuse.org -- Fix tracker search backend: the 0.10 tracker-client library has a different soname +Patch23: nautilus-tracker-0.10.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-icon-theme @@ -121,6 +123,7 @@ gnome-patch-translation-prepare %patch20 -p1 #%patch21 -p1 %patch22 -p1 +%patch23 -p1 gnome-patch-translation-update %build From 35dc7acb2dbc8ea48eb5bafd48fbbcf3a021f9b5508ca389623aee031e04abf4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 20 Feb 2011 18:50:28 +0000 Subject: [PATCH 2/6] Updating link to change in openSUSE:Factory/nautilus revision 94.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=c7b8d26204e7fd31d6fa392161be4121 --- nautilus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nautilus.spec b/nautilus.spec index 6984599..1fc4968 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -23,7 +23,7 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities Version: 2.32.2.1 -Release: 2 +Release: 8 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 From 7ac84d6c7ceea6575e900962906c76e5e16a5e9e4ec3fb78b4e7256227c77b37 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 17:49:32 +0000 Subject: [PATCH 3/6] Accepting request 67438 from GNOME:Next ok OBS-URL: https://build.opensuse.org/request/show/67438 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=126 --- nautilus-2.32.2.1.tar.bz2 | 3 - nautilus-3.0.0.tar.bz2 | 3 + nautilus-bgo350950-search-desktop.diff | 12 +- ...962-folder-icon-for-menus-and-windows.diff | 56 ------- nautilus-tracker-0.10.patch | 22 --- nautilus.changes | 150 +++++++++++++++++- nautilus.spec | 92 ++++------- 7 files changed, 188 insertions(+), 150 deletions(-) delete mode 100644 nautilus-2.32.2.1.tar.bz2 create mode 100644 nautilus-3.0.0.tar.bz2 delete mode 100644 nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff delete mode 100644 nautilus-tracker-0.10.patch diff --git a/nautilus-2.32.2.1.tar.bz2 b/nautilus-2.32.2.1.tar.bz2 deleted file mode 100644 index c8fc017..0000000 --- a/nautilus-2.32.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 -size 6350203 diff --git a/nautilus-3.0.0.tar.bz2 b/nautilus-3.0.0.tar.bz2 new file mode 100644 index 0000000..f8b2495 --- /dev/null +++ b/nautilus-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6842be325c7acd5bb889ed93dfb1ed8b9ccc4a1ff7e034cb083895e74e59ebe3 +size 5618454 diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff index 3394762..281a547 100644 --- a/nautilus-bgo350950-search-desktop.diff +++ b/nautilus-bgo350950-search-desktop.diff @@ -13,22 +13,22 @@ desktops. create mode 100644 nautilus-search.desktop.in -Index: nautilus-2.27.1/data/Makefile.am +Index: nautilus-2.91.4/data/Makefile.am =================================================================== ---- nautilus-2.27.1.orig/data/Makefile.am -+++ nautilus-2.27.1/data/Makefile.am +--- nautilus-2.91.4.orig/data/Makefile.am ++++ nautilus-2.91.4/data/Makefile.am @@ -10,6 +10,7 @@ desktop_in_files = \ nautilus.desktop.in \ nautilus-home.desktop.in \ nautilus-computer.desktop.in \ + nautilus-search.desktop.in \ nautilus-folder-handler.desktop.in \ - nautilus-file-management-properties.desktop.in \ nautilus-browser.desktop.in \ -Index: nautilus-2.27.1/data/nautilus-search.desktop.in + nautilus-autorun-software.desktop.in +Index: nautilus-2.91.4/data/nautilus-search.desktop.in =================================================================== --- /dev/null -+++ nautilus-2.27.1/data/nautilus-search.desktop.in ++++ nautilus-2.91.4/data/nautilus-search.desktop.in @@ -0,0 +1,114 @@ +[Desktop Entry] +Encoding=UTF-8 diff --git a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff b/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff deleted file mode 100644 index ecdc3c7..0000000 --- a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff +++ /dev/null @@ -1,56 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=350962 - -From: Federico Mena Quintero - -https://bugzilla.novell.com/show_bug.cgi?id=117333 - -Use "gnome-fs-directory" instead of "file-manager" as an icon. A -folder is more recognizable than a filing cabinet. ---- - - nautilus-file-management-properties.desktop.in.in | 2 +- - nautilus.desktop.in.in | 2 +- - src/nautilus-file-management-properties.c | 2 +- - src/nautilus-navigation-window.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - - -Index: nautilus-2.31.6/data/nautilus-file-management-properties.desktop.in.in -=================================================================== ---- nautilus-2.31.6.orig/data/nautilus-file-management-properties.desktop.in.in -+++ nautilus-2.31.6/data/nautilus-file-management-properties.desktop.in.in -@@ -2,7 +2,7 @@ - _Name=File Management - _Comment=Change the behaviour and appearance of file manager windows - Exec=nautilus-file-management-properties --Icon=system-file-manager -+Icon=gnome-fs-directory - Terminal=false - Type=Application - StartupNotify=true -Index: nautilus-2.31.6/data/nautilus.desktop.in.in -=================================================================== ---- nautilus-2.31.6.orig/data/nautilus.desktop.in.in -+++ nautilus-2.31.6/data/nautilus.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=File Manager - Exec=nautilus --Icon=system-file-manager -+Icon=gnome-fs-directory - Terminal=false - Type=Application - StartupNotify=true -Index: nautilus-2.31.6/src/nautilus-file-management-properties.c -=================================================================== ---- nautilus-2.31.6.orig/src/nautilus-file-management-properties.c -+++ nautilus-2.31.6/src/nautilus-file-management-properties.c -@@ -807,7 +807,7 @@ nautilus_file_management_properties_dial - (GClosureNotify)g_object_unref, - 0); - -- gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-file-manager"); -+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-fs-directory"); - - if (window) { - gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); diff --git a/nautilus-tracker-0.10.patch b/nautilus-tracker-0.10.patch deleted file mode 100644 index 59690c1..0000000 --- a/nautilus-tracker-0.10.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c -=================================================================== ---- nautilus-2.32.2.orig/libnautilus-private/nautilus-search-engine-tracker.c -+++ nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c -@@ -122,10 +122,16 @@ open_libtracker (void) - done = TRUE; - flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL; - -- tracker = g_module_open ("libtracker-client-0.8.so.0", flags); -+ tracker = g_module_open ("libtracker-client-0.10.so.0", flags); -+ /* we use the same API as in 0.8 */ - version = TRACKER_0_8; - - if (!tracker) { -+ tracker = g_module_open ("libtracker-client-0.8.so.0", flags); -+ version = TRACKER_0_8; -+ } -+ -+ if (!tracker) { - tracker = g_module_open ("libtracker-client-0.7.so.0", flags); - - if (tracker && !g_module_symbol (tracker, "tracker_resources_sparql_query_async", &x)) { diff --git a/nautilus.changes b/nautilus.changes index 9e00d97..b0b0a4a 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Tue Apr 5 13:24:51 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Use Ctrl+Delete as keyboard shortcut to trash files + + Make sure we always open new windows from the desktop + + Fix a crasher + + Updated translations. + +------------------------------------------------------------------- +Mon Apr 4 11:54:14 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.94: + + Fix eject button hover in places sidebar + + Use new gnome-help pages for help buttons + + Fix a crasher when toggling desktop_is_home_dir + + Fix a memory leak + +------------------------------------------------------------------- +Mon Mar 28 15:31:24 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.93: + + Memory leak fixes + + Updated translations +- Changes from version 2.91.92: + + Use a raised button for Search + + Tweak the floating bar background + + Only show the "Loading..." floating bar after half a second of + loading. + + Style cluebars according to mockups + + Fix some split view regressions + + Misc bugfixes +- Changes from version 2.91.91: + + Allow the dbus manager to run as a service + + Create folders in subdirectories in list view, when possible + + Make sure we don't focus headers in the places sidebar + + Don't activate 'Rename' in the sidebar for non-bookmarks + + Fix the list view not updating anymore after creating an empty file + + Fix regressions in rename widget focus + + Fix some UI regressions from the latest changes +- Changes from version 2.91.90.1: + + Make modules of extensions pulling in ORBit resident, to avoid + ORBit's atexit()'s handler to call into unloaded code + + Cleanup some unused code +- Changes from version 2.91.90: + + Huge changes in the user interface, to match GNOME3 mockups + + Remove the spatial mode + + Updated tracker search engine to use libtracker-sparql + + Consistently use "Home" instead of the username + + Rename the GSettings schema path to /org/gnome/nautilus + + Remove the ability for extensions to create toolbar items +- Remove nautilus-tracker-0.10.patch: fixed upstream. + ------------------------------------------------------------------- Sat Feb 19 18:13:23 CET 2011 - vuntz@opensuse.org @@ -22,11 +75,98 @@ Sun Feb 13 16:54:03 CET 2011 - vuntz@opensuse.org ------------------------------------------------------------------- Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org -- Update to version 2.32.2.1: - + Another fix for a crasher when unmounting volumes - + Fix a regression where '~' was not treated as $HOME in the - location bar. - +- Update to version 2.91.9: + + Remove GConf dependency completely + + Fade-out eyecandy for selection rubberband + + Use notifications instead of a status icon for transfer progress + + Change launcher name to 'Files' + + Fix a couple of crashers and UI regressions +- Changes from version 2.91.8: + + Propagate custom icons to bookmarks + + Don't quit the application if there are file operations running + + Better keynav in the places sidebar + + Use symbolic icons for the notification area + + Fix some drawing regressions while renaming + + Fix issues with the default sort order selection + + Completely remove GConf dependency + + Large refactor of NautilusWindow/NautilusView architecture + + Cleanup installed desktop files + + Fix a couple of crashers + + Build with GCC 4.6 +- Changes from version 2.91.7: + + Adapt to GTK+ 2.99.0 deprecations + + Fix a crasher in the pathbar + + Use a consistent name for the Home folder + + Use a consistent name for the 'Create New Folder/Document' + menu items + + Build tweaks +- Changes from version 2.91.6: + + Fix build with GTK+ 2.91.7 +- Changes from version 2.91.5: + + Tweak sidebar appearance with CSS + + Remove 'exit-with-last-window' preference + + Remove support for saving state with XSMP + + Fix some UI GtkStyleContext regressions + + Fix a11y for NautilusIconCanvasItem + + Properly support '~' in the location bar +- Changes from version 2.91.4: + + Port to the new GtkAppChooser widget family + + Port to GtkStyleContext* Add DBus interfaces for copying files + and emptying trash + + Remove Beagle search support + + Remove History and Notes sidebar + + Use a new simpler debug infrastructure + + Make the preferences an app-wide singleton window + + Fix some drawing regressions +- Changes from version 2.91.3: + + Remove autorun and automount machinery, it moved to + gnome-settings-daemon + + Don't install the 'File Management Properties' binary; there's + now a capplet in gnome-control-center for the autorun system + settings. + + Fix interaction with the session manager + + Don't use gtk_[h|v]_separator_new + + Identify OGG Vorbis files as music in the search UI + + Require new gnome-desktop +- Changes from version 2.91.2: + + Use GSettings for desktop background + + Cleanups of the emblem-related code + + Fix some bad interactions with GApplication + + Fix an annoying crasher +- Changes from version 2.91.1: + + Fix a number of GTK+ 3 regressions + + Port to the new GApplication API + + Add a settings key to make the background fade effect optional + + Add a settings key to register an external mass-renamer + + Drop support for old EXIF/XMP APIs + + Move the nautilus-sendto extension module in-tree +- Changes from version 2.91.0.1: + + Fix a crash related to GtkSpinner + + Fix the filename cell renderer to use the new GtkSizeRequest + functions +- Changes from version 2.91.0: + + New UI for the 'Places' sidebar + + New UI for the 'Connect to server' dialogue + + Highlight the eject button upon hovering in the Places sidebar + + Make file conflict dialog strings I18N-friendly + + Port to GTK3 new drawing functions + + Cleanup background-related code + + Various crashers and glitches fixes +- Changes from version 2.90.1: + + Port to GSettings + + Port to cairo drawing + + Remove the "Backgrounds and Emblems" feature + + Use GEmblemedIcon to draw icon emblems in list/tree views + + Cleanup of libeel's obsolete code + + Always show free space in the status string + + Disable icon scaling outside the desktop + + Various minor UI fixes +- Remove nautilus-bnc117333-....diff: + fixed upstream +- Remove nautilus-boot-order.patch: no longer needed +- Disable nautilus-bnc363122-lockdown-context-menus.diff: + need rebase +- Disable nautilus-bgo350950-search-desktop.diff: need rebase ------------------------------------------------------------------- Wed Dec 8 19:51:13 CET 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 1fc4968..332fab2 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -16,14 +16,11 @@ # -# Starting with openSUSE 11.3 we use tracker instead of beagle -%define use_tracker 0%{suse_version} >= 1130 - Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 2.32.2.1 -Release: 8 +Version: 3.0.0 +Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -34,20 +31,16 @@ Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff -# PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window -Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff # PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio Patch9: nautilus-146947-rename-bad-parameters-message.diff # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff -# PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com +# PATCH_NEEDS-REBASE PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com 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 # PATCH-FIX-UPSTREAM nautilus-boot-order.patch bgo#619841 sshaw@decriptor.com -- From SLED w/o sreadahead. Delays applets Patch22: nautilus-boot-order.patch -# PATCH-FIX-UPSTREAM nautilus-tracker-0.10.patch bgo#642770 vuntz@opensuse.org -- Fix tracker search backend: the 0.10 tracker-client library has a different soname -Patch23: nautilus-tracker-0.10.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-icon-theme @@ -55,34 +48,25 @@ BuildRequires: gnome-patch-translation BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool +BuildRequires: libexif-devel 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: libxml2-devel +BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gail-3.0) +BuildRequires: pkgconfig(libnotify) 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) -BuildRequires: pkgconfig(unique-1.0) +# needed for directory ownership +BuildRequires: dbus-1 # So that symlinks to icons work: -Requires: gnome-icon-theme +Requires: gnome-desktop gnome-icon-theme Recommends: %{name}-lang Recommends: gvfs Provides: nautilus2 = %{version} Obsoletes: nautilus2 < %{version} -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description Nautilus is the file manager for the GNOME desktop. @@ -115,19 +99,16 @@ This package contains development files for nautilus. %prep %setup -q translation-update-upstream -gnome-patch-translation-prepare -%patch4 -p1 -%patch5 -p1 +#gnome-patch-translation-prepare +##%patch4 -p1 #%patch9 -p0 ### %patch15 -p1 -%patch20 -p1 +####%patch20 -p1 #%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -gnome-patch-translation-update +#gnome-patch-translation-update %build -NOCONFIGURE=1 gnome-autogen.sh +#NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ --enable-gtk-doc @@ -142,7 +123,7 @@ NOCONFIGURE=1 gnome-autogen.sh %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -rm $RPM_BUILD_ROOT/%{_libdir}/*.*a +rm $RPM_BUILD_ROOT/%{_libdir}/{*.*a,nautilus/extensions-3.0/*.la} ### 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/ @@ -150,37 +131,25 @@ ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ %suse_update_desktop_file nautilus %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-folder-handler -%suse_update_desktop_file nautilus-home -%suse_update_desktop_file nautilus-search -%suse_update_desktop_file network-scheme # Install the archive mime handler test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop %{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop %suse_update_desktop_file mount-archive -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0 +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-3.0 %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%pre -f %{name}.schemas_pre - %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %mime_database_post -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %mime_database_postun @@ -189,25 +158,30 @@ rm -rf $RPM_BUILD_ROOT %postun -n libnautilus-extension1 -p /sbin/ldconfig -%files -f %{name}.schemas_list +%files %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO %{_bindir}/* +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/GConf/gsettings/*.convert %{_datadir}/applications/*.desktop %{_datadir}/mime/packages/*.xml %{_datadir}/nautilus %{_datadir}/pixmaps/nautilus %{_datadir}/pixmaps/*.png %{_datadir}/icons/hicolor/*/*/*.* +%{_datadir}/dbus-1/services/org.gnome.Nautilus.service +%dir %{_libdir}/nautilus +%{_libdir}/girepository-1.0/Nautilus-3.0.typelib %{_libexecdir}/nautilus-convert-metadata %doc %{_mandir}/man1/nautilus*.1.gz %files -n libnautilus-extension1 %defattr(-,root,root) %dir %{_libdir}/nautilus -%dir %{_libdir}/nautilus/extensions-2.0 -%{_libdir}/libnautilus-extension.so.* -%{_libdir}/girepository-1.0/Nautilus-2.0.typelib +%dir %{_libdir}/nautilus/extensions-3.0 +%{_libdir}/nautilus/extensions-3.0/*.so +%{_libdir}/libnautilus-extension.so.1* %files lang -f %{name}.lang @@ -216,10 +190,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_includedir}/* %{_libdir}/pkgconfig/*.pc +%{_datadir}/gir-1.0/*.gir # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* -%{_datadir}/gir-1.0/Nautilus-2.0.gir + + %changelog From 13969ca0db7e0c298fc29a5ca460cba95af6a20e38199f5e8caec627d3d22190 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 18:32:58 +0000 Subject: [PATCH 4/6] Accepting request 68331 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68331 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=127 --- nautilus-boot-order.patch | 113 -------------------------------------- nautilus.changes | 27 ++++++--- nautilus.spec | 38 ++++++------- 3 files changed, 37 insertions(+), 141 deletions(-) delete mode 100644 nautilus-boot-order.patch diff --git a/nautilus-boot-order.patch b/nautilus-boot-order.patch deleted file mode 100644 index 4eb2ed0..0000000 --- a/nautilus-boot-order.patch +++ /dev/null @@ -1,113 +0,0 @@ -Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient-xsmp.c -=================================================================== ---- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient-xsmp.c -+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient-xsmp.c -@@ -317,6 +317,9 @@ sm_client_xsmp_startup (EggSMClient *cli - char *ret_client_id; - char error_string_ret[256]; - -+ if (xsmp->connection) -+ return; -+ - xsmp->client_id = g_strdup (client_id); - - ice_init (); -Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.c -=================================================================== ---- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient.c -+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.c -@@ -175,6 +175,7 @@ egg_sm_client_class_init (EggSMClientCla - 0); - } - -+static gboolean sm_client_connect = FALSE; - static gboolean sm_client_disable = FALSE; - static char *sm_client_state_file = NULL; - static char *sm_client_id = NULL; -@@ -202,8 +203,10 @@ sm_client_post_parse_func (GOptionContex - * use the same client id. */ - g_unsetenv ("DESKTOP_AUTOSTART_ID"); - -- if (EGG_SM_CLIENT_GET_CLASS (client)->startup) -- EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); -+ if (sm_client_connect) { -+ if (EGG_SM_CLIENT_GET_CLASS (client)->startup) -+ EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); -+ } - return TRUE; - } - -@@ -240,6 +243,14 @@ egg_sm_client_get_option_group (void) - { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN, - G_OPTION_ARG_STRING, &sm_config_prefix, - NULL, NULL }, -+ /* Normally the client is connected to the session manager -+ * automatically, when calling 'egg_sm_client_get_option_group'. -+ * One can disable this automatic connect by calling this function. -+ * Using this function should definitely be an exception. -+ */ -+ { "sm-connect", 0, 0, -+ G_OPTION_ARG_NONE, &sm_client_connect, -+ NULL, NULL }, - { NULL } - }; - GOptionGroup *group; -@@ -472,6 +483,15 @@ egg_sm_client_will_quit (EggSMClient *cl - EGG_SM_CLIENT_GET_CLASS (client)->will_quit (client, will_quit); - } - -+void -+egg_sm_client_startup (EggSMClient *client) -+{ -+ g_return_if_fail (EGG_IS_SM_CLIENT (client)); -+ -+ if (EGG_SM_CLIENT_GET_CLASS (client)->startup) -+ EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); -+} -+ - /** - * egg_sm_client_end_session: - * @style: a hint at how to end the session -Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.h -=================================================================== ---- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient.h -+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.h -@@ -106,6 +106,8 @@ void egg_sm_client_set_resta - /* Handling "quit_requested" signal */ - void egg_sm_client_will_quit (EggSMClient *client, - gboolean will_quit); -+/* startup the client (connect to sm) */ -+void egg_sm_client_startup (EggSMClient *client); - - /* Initiate a logout/reboot/shutdown */ - gboolean egg_sm_client_end_session (EggSMClientEndStyle style, -Index: nautilus-2.30.1/src/nautilus-main.c -=================================================================== ---- nautilus-2.30.1.orig/src/nautilus-main.c -+++ nautilus-2.30.1/src/nautilus-main.c -@@ -315,6 +315,13 @@ setup_debug_log (void) - setup_debug_log_glog (); - } - -+static gboolean -+startup_done_cb (EggSMClient *client) -+{ -+ egg_sm_client_startup (client); -+ return FALSE; -+} -+ - int - main (int argc, char *argv[]) - { -@@ -541,6 +548,11 @@ main (int argc, char *argv[]) - } - - if (is_event_loop_needed ()) { -+ /* Register with the session manager when we're done bringing up the -+ * desktop. This means we don't have to compete for resources with the -+ * application startup phase, so the desktop comes up sooner. */ -+ g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) startup_done_cb, application->smclient, NULL); -+ - gtk_main (); - } - } diff --git a/nautilus.changes b/nautilus.changes index b0b0a4a..f7876e6 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -92,7 +92,7 @@ Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org + Large refactor of NautilusWindow/NautilusView architecture + Cleanup installed desktop files + Fix a couple of crashers - + Build with GCC 4.6 + + Build with GCC 4.6 - Changes from version 2.91.7: + Adapt to GTK+ 2.99.0 deprecations + Fix a crasher in the pathbar @@ -160,13 +160,24 @@ Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org + Cleanup of libeel's obsolete code + Always show free space in the status string + Disable icon scaling outside the desktop - + Various minor UI fixes -- Remove nautilus-bnc117333-....diff: - fixed upstream -- Remove nautilus-boot-order.patch: no longer needed -- Disable nautilus-bnc363122-lockdown-context-menus.diff: - need rebase -- Disable nautilus-bgo350950-search-desktop.diff: need rebase + + Various minor UI fixes +- Remove nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff: + fixed upstream. +- Remove nautilus-boot-order.patch: no longer needed as session + support was dropped. +- Disable nautilus-bnc363122-lockdown-context-menus.diff: + need rebase. +- Disable nautilus-bgo350950-search-desktop.diff: need rebase. +- Remove use_tracker macro as beagle support was dropped. +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros. +- Add pkgconfig(libnotify) BuildRequires. +- Remove pkgconfig() BuildRequires: gconf-2.0, unique-1.0. +- Change pkgconfig() BuildRequires for GNOME 3 port: + + Old ones: gail, gnome-desktop-2.0, gtk+-2.0. + + New ones: gail-3.0, gnome-desktop-3.0, gtk+-3.0. +- Add dbus-1 BuildRequires for directory ownership. + ------------------------------------------------------------------- Wed Dec 8 19:51:13 CET 2010 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 332fab2..ff37d3d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -29,7 +29,7 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface +# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio Patch9: nautilus-146947-rename-bad-parameters-message.diff @@ -39,8 +39,8 @@ Patch15: nautilus-drives-and-volumes-on-desktop.diff 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 -# PATCH-FIX-UPSTREAM nautilus-boot-order.patch bgo#619841 sshaw@decriptor.com -- From SLED w/o sreadahead. Delays applets -Patch22: nautilus-boot-order.patch +# needed for directory ownership +BuildRequires: dbus-1 BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-icon-theme @@ -48,20 +48,20 @@ BuildRequires: gnome-patch-translation BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: libexif-devel BuildRequires: libexempi-devel BuildRequires: libselinux-devel -BuildRequires: libxml2-devel -BuildRequires: pkgconfig(gnome-desktop-3.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gail-3.0) -BuildRequires: pkgconfig(libnotify) BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# needed for directory ownership -BuildRequires: dbus-1 +BuildRequires: pkgconfig(gail-3.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pango) # So that symlinks to icons work: -Requires: gnome-desktop gnome-icon-theme +Requires: gnome-icon-theme Recommends: %{name}-lang Recommends: gvfs Provides: nautilus2 = %{version} @@ -158,30 +158,30 @@ rm -rf $RPM_BUILD_ROOT %postun -n libnautilus-extension1 -p /sbin/ldconfig -%files +%files %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO %{_bindir}/* -%{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/GConf/gsettings/*.convert %{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/services/org.gnome.Nautilus.service +%{_datadir}/glib-2.0/schemas/*.xml +%{_datadir}/icons/hicolor/*/*/*.* %{_datadir}/mime/packages/*.xml %{_datadir}/nautilus %{_datadir}/pixmaps/nautilus %{_datadir}/pixmaps/*.png -%{_datadir}/icons/hicolor/*/*/*.* -%{_datadir}/dbus-1/services/org.gnome.Nautilus.service %dir %{_libdir}/nautilus -%{_libdir}/girepository-1.0/Nautilus-3.0.typelib %{_libexecdir}/nautilus-convert-metadata %doc %{_mandir}/man1/nautilus*.1.gz %files -n libnautilus-extension1 %defattr(-,root,root) +%{_libdir}/libnautilus-extension.so.1* +%{_libdir}/girepository-1.0/Nautilus-3.0.typelib %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-3.0 %{_libdir}/nautilus/extensions-3.0/*.so -%{_libdir}/libnautilus-extension.so.1* %files lang -f %{name}.lang @@ -196,6 +196,4 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* - - %changelog From 954e5d030265925c351595a10df146e82613d1e51afde1d01e65d2c27f70bc11 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 27 Apr 2011 13:34:50 +0000 Subject: [PATCH 5/6] Accepting request 68540 from home:fcrozat:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/68540 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=128 --- nautilus-3.0.0.tar.bz2 | 3 --- nautilus-3.0.1.tar.bz2 | 3 +++ nautilus.changes | 14 ++++++++++++++ nautilus.spec | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) delete mode 100644 nautilus-3.0.0.tar.bz2 create mode 100644 nautilus-3.0.1.tar.bz2 diff --git a/nautilus-3.0.0.tar.bz2 b/nautilus-3.0.0.tar.bz2 deleted file mode 100644 index f8b2495..0000000 --- a/nautilus-3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6842be325c7acd5bb889ed93dfb1ed8b9ccc4a1ff7e034cb083895e74e59ebe3 -size 5618454 diff --git a/nautilus-3.0.1.tar.bz2 b/nautilus-3.0.1.tar.bz2 new file mode 100644 index 0000000..b45b05c --- /dev/null +++ b/nautilus-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8 +size 5622145 diff --git a/nautilus.changes b/nautilus.changes index f7876e6..26071ee 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Apr 27 11:29:09 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.1: + + Fix white background bug when drawing desktop icons + + Fix crash while ejecting volumes from the places sidebar + + Fix enter not working in the places sidebar + + Fix conflict dialog labels and entry sizing + + Fix drawing artifacts in the search bar + + Fix single click preferences mismatch + + Fix additional details label colors when using a11y themes + + Fix some minor/sporadic crashers + + Fix libnotify and libexif version checks + ------------------------------------------------------------------- Tue Apr 5 13:24:51 UTC 2011 - fcrozat@novell.com diff --git a/nautilus.spec b/nautilus.spec index ff37d3d..7b6f6be 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -19,7 +19,7 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 3.0.0 +Version: 3.0.1 Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop From 85a669cef2f2406eda41e97903d93b5d0ad32137f383923743953d46faec2f43 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 May 2011 15:51:25 +0000 Subject: [PATCH 6/6] Accepting request 69588 from home:vuntz:branches:GNOME:Factory Update to 3.0.1.1 OBS-URL: https://build.opensuse.org/request/show/69588 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=129 --- nautilus-3.0.1.1.tar.bz2 | 3 +++ nautilus-3.0.1.tar.bz2 | 3 --- nautilus.changes | 7 +++++++ nautilus.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 nautilus-3.0.1.1.tar.bz2 delete mode 100644 nautilus-3.0.1.tar.bz2 diff --git a/nautilus-3.0.1.1.tar.bz2 b/nautilus-3.0.1.1.tar.bz2 new file mode 100644 index 0000000..8c1647b --- /dev/null +++ b/nautilus-3.0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6 +size 5622454 diff --git a/nautilus-3.0.1.tar.bz2 b/nautilus-3.0.1.tar.bz2 deleted file mode 100644 index b45b05c..0000000 --- a/nautilus-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8 -size 5622145 diff --git a/nautilus.changes b/nautilus.changes index 26071ee..17f11a6 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 4 13:10:25 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.0.1.1: + + Fix some crashers + + Don't show file transfer progress twice + ------------------------------------------------------------------- Wed Apr 27 11:29:09 UTC 2011 - fcrozat@novell.com diff --git a/nautilus.spec b/nautilus.spec index 7b6f6be..269281e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -19,7 +19,7 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 3.0.1 +Version: 3.0.1.1 Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop