pool/nautilus
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 69595 from GNOME:Factory

Browse Source 
Update to 3.0.1.1 (forwarded request 69588 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/69595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=95
This commit is contained in:
Sascha Peilicke 2011-05-16 08:38:41 +00:00 committed by Git OBS Bridge
commit 20c232b9d1
8 changed files with 216 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nautilus-2.32.2.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
size 6350203

3
nautilus-3.0.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6
size 5622454

12
nautilus-bgo350950-search-desktop.diff
View File

@ -13,22 +13,22 @@ desktops.
create mode 100644 nautilus-search.desktop.in 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.91.4.orig/data/Makefile.am
+++ nautilus-2.27.1/data/Makefile.am +++ nautilus-2.91.4/data/Makefile.am
@@ -10,6 +10,7 @@ desktop_in_files = \ @@ -10,6 +10,7 @@ desktop_in_files = \
nautilus.desktop.in \ nautilus.desktop.in \
nautilus-home.desktop.in \ nautilus-home.desktop.in \
nautilus-computer.desktop.in \ nautilus-computer.desktop.in \
+ nautilus-search.desktop.in \ + nautilus-search.desktop.in \
nautilus-folder-handler.desktop.in \ nautilus-folder-handler.desktop.in \
nautilus-file-management-properties.desktop.in \
nautilus-browser.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 --- /dev/null
+++ nautilus-2.27.1/data/nautilus-search.desktop.in +++ nautilus-2.91.4/data/nautilus-search.desktop.in
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
+[Desktop Entry] +[Desktop Entry]
+Encoding=UTF-8 +Encoding=UTF-8

56
nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
View File

@ -1,56 +0,0 @@
http://bugzilla.gnome.org/show_bug.cgi?id=350962
From: Federico Mena Quintero <federico@gnu.org>
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));

113
nautilus-boot-order.patch
View File

@ -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 ();
}
}

22
nautilus-tracker-0.10.patch
View File

@ -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)) {

180
nautilus.changes
View File

@ -1,3 +1,77 @@
-------------------------------------------------------------------
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
- 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
- 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 Sat Feb 19 18:13:23 CET 2011 - vuntz@opensuse.org
@ -22,10 +96,108 @@ Sun Feb 13 16:54:03 CET 2011 - vuntz@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org
- Update to version 2.32.2.1: - Update to version 2.91.9:
+ Another fix for a crasher when unmounting volumes + Remove GConf dependency completely
+ Fix a regression where '~' was not treated as $HOME in the + Fade-out eyecandy for selection rubberband
location bar. + 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-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 Wed Dec 8 19:51:13 CET 2010 - vuntz@opensuse.org

88
nautilus.spec
View File

@ -16,14 +16,11 @@
# #
# Starting with openSUSE 11.3 we use tracker instead of beagle
%define use_tracker 0%{suse_version} >= 1130
Name: nautilus Name: nautilus
License: GPLv2+ License: GPLv2+
Group: Productivity/File utilities Group: Productivity/File utilities
Version: 2.32.2.1 Version: 3.0.1.1
Release: 8 Release: 1
# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
Summary: File Manager for the GNOME Desktop Summary: File Manager for the GNOME Desktop
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
@ -32,22 +29,18 @@ Source1: mount-archive.desktop
Source99: baselibs.conf Source99: baselibs.conf
Url: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 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 # 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 Patch9: nautilus-146947-rename-bad-parameters-message.diff
# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com
Patch15: nautilus-drives-and-volumes-on-desktop.diff 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 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) # 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 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 # needed for directory ownership
Patch22: nautilus-boot-order.patch BuildRequires: dbus-1
# 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: fdupes
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gnome-icon-theme BuildRequires: gnome-icon-theme
@ -57,32 +50,23 @@ BuildRequires: gtk-doc
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libexempi-devel BuildRequires: libexempi-devel
BuildRequires: libselinux-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: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gail) BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(unique-1.0)
# So that symlinks to icons work: # So that symlinks to icons work:
Requires: gnome-icon-theme Requires: gnome-icon-theme
Recommends: %{name}-lang Recommends: %{name}-lang
Recommends: gvfs Recommends: gvfs
Provides: nautilus2 = %{version} Provides: nautilus2 = %{version}
Obsoletes: nautilus2 < %{version} Obsoletes: nautilus2 < %{version}
%gconf_schemas_prereq %glib2_gsettings_schema_requires
%description %description
Nautilus is the file manager for the GNOME desktop. Nautilus is the file manager for the GNOME desktop.
@ -115,19 +99,16 @@ This package contains development files for nautilus.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
gnome-patch-translation-prepare #gnome-patch-translation-prepare
%patch4 -p1 ##%patch4 -p1
%patch5 -p1
#%patch9 -p0 #%patch9 -p0
### %patch15 -p1 ### %patch15 -p1
%patch20 -p1 ####%patch20 -p1
#%patch21 -p1 #%patch21 -p1
%patch22 -p1 #gnome-patch-translation-update
%patch23 -p1
gnome-patch-translation-update
%build %build
NOCONFIGURE=1 gnome-autogen.sh #NOCONFIGURE=1 gnome-autogen.sh
%configure\ %configure\
--disable-update-mimedb \ --disable-update-mimedb \
--enable-gtk-doc --enable-gtk-doc
@ -142,7 +123,7 @@ NOCONFIGURE=1 gnome-autogen.sh
%if 0%{?suse_version} <= 1120 %if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif %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/ ### 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 # 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/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/ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
%suse_update_desktop_file nautilus %suse_update_desktop_file nautilus
%suse_update_desktop_file nautilus-autorun-software %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 # Install the archive mime handler
test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop
%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop %{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop
%suse_update_desktop_file mount-archive %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_lang %{name} %{?no_lang_C}
%find_gconf_schemas
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post %post
%glib2_gsettings_schema_post
%desktop_database_post %desktop_database_post
%icon_theme_cache_post %icon_theme_cache_post
%mime_database_post %mime_database_post
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun %postun
%glib2_gsettings_schema_postun
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_postun %icon_theme_cache_postun
%mime_database_postun %mime_database_postun
@ -189,25 +158,30 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libnautilus-extension1 -p /sbin/ldconfig %postun -n libnautilus-extension1 -p /sbin/ldconfig
%files -f %{name}.schemas_list %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
%{_bindir}/* %{_bindir}/*
%{_datadir}/GConf/gsettings/*.convert
%{_datadir}/applications/*.desktop %{_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}/mime/packages/*.xml
%{_datadir}/nautilus %{_datadir}/nautilus
%{_datadir}/pixmaps/nautilus %{_datadir}/pixmaps/nautilus
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_datadir}/icons/hicolor/*/*/*.* %dir %{_libdir}/nautilus
%{_libexecdir}/nautilus-convert-metadata %{_libexecdir}/nautilus-convert-metadata
%doc %{_mandir}/man1/nautilus*.1.gz %doc %{_mandir}/man1/nautilus*.1.gz
%files -n libnautilus-extension1 %files -n libnautilus-extension1
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libnautilus-extension.so.1*
%{_libdir}/girepository-1.0/Nautilus-3.0.typelib
%dir %{_libdir}/nautilus %dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-2.0 %dir %{_libdir}/nautilus/extensions-3.0
%{_libdir}/libnautilus-extension.so.* %{_libdir}/nautilus/extensions-3.0/*.so
%{_libdir}/girepository-1.0/Nautilus-2.0.typelib
%files lang -f %{name}.lang %files lang -f %{name}.lang
@ -216,10 +190,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/* %{_includedir}/*
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/gir-1.0/*.gir
# Own these repositories to not depend on gtk-doc while building: # Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%{_datadir}/gir-1.0/Nautilus-2.0.gir
%changelog %changelog