Accepting request 77855 from home:vuntz:branches:GNOME:Factory
Update to 3.1.4 OBS-URL: https://build.opensuse.org/request/show/77855 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=138
This commit is contained in:
parent
a7531fe472
commit
1836e6784c
@ -1,24 +0,0 @@
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=350976
|
||||
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=146947
|
||||
|
||||
libsmbclient returns EINVAL if one sends it filenames with illegal
|
||||
characters, like '\'. Display a more useful error message than
|
||||
"generic error" in that case.
|
||||
|
||||
Index: src/file-manager/fm-error-reporting.c
|
||||
===================================================================
|
||||
--- src/file-manager/fm-error-reporting.c.orig
|
||||
+++ src/file-manager/fm-error-reporting.c
|
||||
@@ -124,6 +124,11 @@ fm_report_error_renaming_file (NautilusF
|
||||
new_name_truncated);
|
||||
}
|
||||
break;
|
||||
+ case GNOME_VFS_ERROR_BAD_PARAMETERS:
|
||||
+ message = g_strdup_printf (_("Couldn't rename \"%s\" to \"%s\". Please make sure the new name has "
|
||||
+ "only valid characters in it."),
|
||||
+ original_name_truncated, new_name_truncated);
|
||||
+ break;
|
||||
default:
|
||||
break;
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bd2560e00638720edc1e6b3ecd5a0cad67dcfa3be64926df34789e2b470e849d
|
||||
size 5677735
|
3
nautilus-3.1.4.tar.bz2
Normal file
3
nautilus-3.1.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:572fdb653c57b4ff91da02380625ba324abc978f128ca4bede9bffd248bfac91
|
||||
size 5676103
|
@ -1,146 +0,0 @@
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=350950
|
||||
|
||||
From: Federico Mena Quintero <federico@gnu.org>
|
||||
|
||||
Install a nautilus-search.desktop with a shortcut to
|
||||
x-nautilus-search: so that people can easily add *that* link to their
|
||||
desktops.
|
||||
---
|
||||
|
||||
Makefile.am | 1
|
||||
nautilus-search.desktop.in | 113 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 114 insertions(+), 0 deletions(-)
|
||||
create mode 100644 nautilus-search.desktop.in
|
||||
|
||||
|
||||
Index: nautilus-2.91.4/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-browser.desktop.in \
|
||||
nautilus-autorun-software.desktop.in
|
||||
Index: nautilus-2.91.4/data/nautilus-search.desktop.in
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ nautilus-2.91.4/data/nautilus-search.desktop.in
|
||||
@@ -0,0 +1,114 @@
|
||||
+[Desktop Entry]
|
||||
+Encoding=UTF-8
|
||||
+Name=Search for Files...
|
||||
+Name[bg]=Търсене за файлове...
|
||||
+Name[ca]=Cerca fitxers...
|
||||
+Name[cs]=Hledat soubory...
|
||||
+Name[cy]=Chwilio am Ffeiliau...
|
||||
+Name[da]=Søg efter filer...
|
||||
+Name[de]=Nach Dateien suchen...
|
||||
+Name[el]=Αναζήτηση για αρχεία...
|
||||
+Name[en_CA]=Search for Files...
|
||||
+Name[en_GB]=Search for Files...
|
||||
+Name[es]=Buscar archivos...
|
||||
+Name[et]=Otsi faile...
|
||||
+Name[fa]=جستجوی پروندهها...
|
||||
+Name[fi]=Etsi tiedostoja...
|
||||
+Name[fr]=Rechercher des fichiers...
|
||||
+Name[gl]=Buscar ficheiros...
|
||||
+Name[gu]=ફાઈલો માટે શોધો...
|
||||
+Name[he]=חפש קבצים...
|
||||
+Name[hi]=फ़ाइलों हेतु ढूंढें...
|
||||
+Name[hu]=Fájlok keresése...
|
||||
+Name[id]=Cari Berkas...
|
||||
+Name[it]=Cerca file...
|
||||
+Name[ja]=ファイルの検索...
|
||||
+Name[ko]=파일 찾기...
|
||||
+Name[lt]=Ieškoti bylų...
|
||||
+Name[mk]=Барај датотеки...
|
||||
+Name[nb]=Søk etter filer...
|
||||
+Name[ne]=...फाइलहरूलाई खोज्नुहोस्
|
||||
+Name[nl]=Bestanden zoeken...
|
||||
+Name[no]=Søk etter filer...
|
||||
+Name[pa]=ਫਾਇਲਾਂ ਦੀ ਖੋਜ...
|
||||
+Name[pl]=Wyszukaj pliki...
|
||||
+Name[pt]=Procurar Ficheiros...
|
||||
+Name[pt_BR]=Procurar por Arquivos...
|
||||
+Name[ro]=Caută fişiere...
|
||||
+Name[ru]=Поиск файлов...
|
||||
+Name[sq]=Kërko për files...
|
||||
+Name[sr]=Тражи датотеке...
|
||||
+Name[sr@Latn]=Traži datoteke...
|
||||
+Name[sv]=Sök efter filer...
|
||||
+Name[th]=ค้นหาแฟ้ม...
|
||||
+Name[tr]=Dosya Ara...
|
||||
+Name[uk]=Пошук файлів...
|
||||
+Name[vi]=Tìm kiếm tập tin...
|
||||
+Name[xh]=Khangela iiFayili...
|
||||
+Name[zh_CN]=搜索文件...
|
||||
+Name[zh_TW]=搜尋檔案...
|
||||
+Comment=Find files, folders, and documents on your computer
|
||||
+Comment[ar]=إيجاد ملفّات و مجلّدات و مستندات على حاسوبك
|
||||
+Comment[az]=Kompüterinizdəki faylları, qovluqları və sənədləri tapın
|
||||
+Comment[bg]=Намиране на файлове, папки и документи на вашия компютър
|
||||
+Comment[bs]=Nalazi datoteke, direktorije, i dokumente na vašem računaru
|
||||
+Comment[ca]=Cerca fitxers, carpetes i documents al vostre ordinador
|
||||
+Comment[cs]=Hledat soubory, adresáře a dokumenty ve vašem počítači
|
||||
+Comment[cy]=Canfod ffeiliau, ffolderi a dogfennau ar eich cyfrifiadur
|
||||
+Comment[da]=Find filer, mapper og dokumenter på din maskine
|
||||
+Comment[de]=Dateien, Ordner und Dokumente auf Ihrem Computer finden
|
||||
+Comment[el]=Εύρεση αρχείων, φακέλων και εγγράφων στον υπολογιστή σας
|
||||
+Comment[en_CA]=Find files, folders, and documents on your computer
|
||||
+Comment[en_GB]=Find files, folders, and documents on your computer
|
||||
+Comment[es]=Busca archivos, carpetas y documentos en su equipo
|
||||
+Comment[et]=Failide, kataloogide ja dokumentide otsimine
|
||||
+Comment[eu]=Aurkitu fitxategiak, karpetak eta dokumentuak zure ordenagailuan
|
||||
+Comment[fa]=پیدا کردن پروندهها، پوشهها و نوشتارها در کامپیوتر شما
|
||||
+Comment[fi]=Etsi tiedostoja, kansioita ja asiakirjoja tietokoneeltasi
|
||||
+Comment[fr]=Recherche des fichiers, des dossiers et des documents dans votre ordinateur
|
||||
+Comment[gl]=Bucar ficheiros, carpetas, e documentos no seu ordenador
|
||||
+Comment[gu]=તમારા કમ્પ્યૂટર પર ફાઈલો, ફોલ્ડરો અને દસ્તાવેજો શોધો
|
||||
+Comment[he]=מצא קבצים, תיקיות ומסמכים במחשב שלך
|
||||
+Comment[hi]=कंप्यूटर में फ़ाइल, फ़ोल्डर और दस्तावेज़ ढूंढें
|
||||
+Comment[hu]=Fájlok, mappák és dokumentumok keresése a számítógépen
|
||||
+Comment[id]=Cari berkas, folder, dan dokumen dalam komputer
|
||||
+Comment[it]=Trova file, cartelle e documenti nel computer
|
||||
+Comment[ja]=お使いのコンピュータにあるファイルやフォルダ、ドキュメントを検索します
|
||||
+Comment[ko]=컴퓨터에 들어 있는 파일, 폴더, 문서 찾기
|
||||
+Comment[lt]=Raskite bylas, aplankus ir dokumentus esančius Jūsų kompiuteryje
|
||||
+Comment[mk]=Најдете датотеки, папки и документи на Вашиот компјутер
|
||||
+Comment[ms]=Cari fail, folder, dan dokumen pada komputer anda
|
||||
+Comment[nb]=Finn filer, mapper og dokumenter på din datamaskin
|
||||
+Comment[ne]=कम्प्युटरका फाइलहरू, फोल्डरहरू, र कागजातहरू फेला पार्नुहोस्
|
||||
+Comment[nl]=Bestanden, mappen en documenten zoeken op uw computer
|
||||
+Comment[nn]=Finn filer, mapper og dokument på datamaskinen
|
||||
+Comment[no]=Finn filer, mapper og dokumenter på din datamaskin
|
||||
+Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੇ ਫਾਇਲਾਂ, ਫੋਲਡਰ ਤੇ ਦਸਤਾਵੇਜ਼ ਲੱਭੋ
|
||||
+Comment[pl]=Wyszukuje pliki, foldery i dokumenty na komputerze
|
||||
+Comment[pt]=Procurar ficheiros, pastas e documentos no seu computador
|
||||
+Comment[pt_BR]=Encontre arquivos, pastas e documentos em seu computador
|
||||
+Comment[ro]=Caută fişiere, dosare şi documente pe calculatorul dumneavoastră
|
||||
+Comment[ru]=Поиск файлов, папок и документов на вашем компьютере
|
||||
+Comment[sk]=Hľadať súbory, priečinky a dokumenty na vašom počítači
|
||||
+Comment[sq]=Gjej files, kartela, dhe dokumentë në kompjuterin tuaj
|
||||
+Comment[sr]=Тражите датотеке, фасцикле и документе на вашем рачунару
|
||||
+Comment[sr@Latn]=Tražite datoteke, fascikle i dokumente na vašem računaru
|
||||
+Comment[sv]=Sök filer, mappar och dokument på din dator
|
||||
+Comment[ta]=உங்கள் கணினியில் உள்ள கோப்புகள்,அடைவுகள் மற்றும் ஆவணங்களை கண்டுபிடி
|
||||
+Comment[th]=ค้นหาแฟ้ม โฟลเดอร์ หรือเอกสาร ในคอมพิวเตอร์เครื่องนี้
|
||||
+Comment[tr]=Bilgisayarınızdaki dosyaları, klasörleri ve belgeleri bulun
|
||||
+Comment[uk]=Пошук файлів, тек та документів на вашому комп'ютері
|
||||
+Comment[vi]=Tìm tập tin, thư mục và tài liệu trên máy tính.
|
||||
+Comment[xh]=Ukufumana iifayili, iziqulathi zeefayili, namaxwebhu kwikhompyutha yakho
|
||||
+Comment[zh_CN]=在您的计算机上查找文件、文件夹和文档
|
||||
+Comment[zh_TW]=在電腦中搜尋檔案、資料夾和文件
|
||||
+Exec=nautilus --no-desktop x-nautilus-search:
|
||||
+Icon=system-search
|
||||
+Terminal=false
|
||||
+Type=Application
|
||||
+StartupNotify=true
|
||||
+Categories=Core;
|
||||
+OnlyShowIn=GNOME;
|
||||
+X-GNOME-Bugzilla-Bugzilla=GNOME
|
||||
+X-GNOME-Bugzilla-Product=nautilus
|
||||
+X-GNOME-Bugzilla-Component=general
|
@ -1,82 +0,0 @@
|
||||
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
|
||||
index 8a9af8e..0465edf 100644
|
||||
--- a/libnautilus-private/nautilus-global-preferences.h
|
||||
+++ b/libnautilus-private/nautilus-global-preferences.h
|
||||
@@ -96,6 +96,9 @@ typedef enum
|
||||
/* The default folder viewer - one of the two enums below */
|
||||
#define NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER "default-folder-viewer"
|
||||
|
||||
+/* Disable context menus */
|
||||
+#define NAUTILUS_PREFERENCES_DISABLE_CONTEXT_MENU "disable-context-menus"
|
||||
+
|
||||
enum
|
||||
{
|
||||
NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW,
|
||||
diff --git a/libnautilus-private/nautilus.convert b/libnautilus-private/nautilus.convert
|
||||
index 5850477..6f91815 100644
|
||||
--- a/libnautilus-private/nautilus.convert
|
||||
+++ b/libnautilus-private/nautilus.convert
|
||||
@@ -23,6 +23,7 @@ desktop-is-home-dir = /apps/nautilus/preferences/desktop_is_home_dir
|
||||
default-folder-viewer = /apps/nautilus/preferences/default_folder_viewer
|
||||
date-format = /apps/nautilus/preferences/date_format
|
||||
show-hidden-files = /desktop/gnome/file_views/show_hidden_files
|
||||
+disable-context-menus = /apps/nautilus/lockdown/disable_context_menus
|
||||
|
||||
[org.gnome.nautilus.icon-view]
|
||||
captions = /apps/nautilus/icon_view/captions
|
||||
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
|
||||
index 178ba82..f29c38f 100644
|
||||
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
|
||||
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
|
||||
@@ -204,6 +204,11 @@
|
||||
<_summary>Bulk rename utility</_summary>
|
||||
<_description>If set, Nautilus will append URIs of selected files and treat the result as a command line for bulk renaming. Bulk rename applications can register themselves in this key by setting the key to a space-separated string of their executable name and any command line options. If the executable name is not set to a full path, it will be searched for in the search path.</_description>
|
||||
</key>
|
||||
+ <key name="disable-context-menus" type="b">
|
||||
+ <default>false</default>
|
||||
+ <_summary>Disable context menus in file views</_summary>
|
||||
+ <_description>Set this to true if you are deploying a kiosk and don't want users to access the context menu in file views.</_description>
|
||||
+ </key>
|
||||
</schema>
|
||||
|
||||
<schema id="org.gnome.nautilus.icon-view" path="/org/gnome/nautilus/icon-view/" gettext-domain="nautilus">
|
||||
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
|
||||
index fbd482d..0492bee 100644
|
||||
--- a/src/nautilus-view.c
|
||||
+++ b/src/nautilus-view.c
|
||||
@@ -8677,6 +8677,11 @@ nautilus_view_pop_up_selection_context_menu (NautilusView *view,
|
||||
{
|
||||
g_assert (NAUTILUS_IS_VIEW (view));
|
||||
|
||||
+ if (g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_DISABLE_CONTEXT_MENU)) {
|
||||
+ DEBUG ("Ignoring request to pop up the context menu for the view's selection");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
/* Make the context menu items not flash as they update to proper disabled,
|
||||
* etc. states by forcing menus to update now.
|
||||
*/
|
||||
@@ -8706,6 +8711,11 @@ nautilus_view_pop_up_background_context_menu (NautilusView *view,
|
||||
{
|
||||
g_assert (NAUTILUS_IS_VIEW (view));
|
||||
|
||||
+ if (g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_DISABLE_CONTEXT_MENU)) {
|
||||
+ DEBUG ("Ignoring request to pop up the context menu for the view's background");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
/* Make the context menu items not flash as they update to proper disabled,
|
||||
* etc. states by forcing menus to update now.
|
||||
*/
|
||||
@@ -8813,6 +8823,11 @@ nautilus_view_pop_up_location_context_menu (NautilusView *view,
|
||||
|
||||
g_assert (NAUTILUS_IS_VIEW (view));
|
||||
|
||||
+ if (g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_DISABLE_CONTEXT_MENU)) {
|
||||
+ DEBUG ("Ignoring request to pop up the context menu for the view");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (location != NULL) {
|
||||
file = nautilus_file_get_by_uri (location);
|
||||
} else {
|
@ -1,116 +0,0 @@
|
||||
commit 3e69fb702393cf42486321c88cede4668329b4c8
|
||||
Author: Ryan Lortie <desrt@desrt.ca>
|
||||
Date: Wed Jul 20 20:25:17 2011 +0200
|
||||
|
||||
all: switch to g_format_size()
|
||||
|
||||
g_format_size_for_display() has been deprecated in GLib and replaced with
|
||||
g_format_size(). Follow that change.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=654995
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 48f463c..7f17360 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -2,7 +2,7 @@ AC_PREREQ(2.54)
|
||||
|
||||
dnl ===========================================================================
|
||||
|
||||
-m4_define(glib_minver, 2.28.0)
|
||||
+m4_define(glib_minver, 2.29.13)
|
||||
m4_define(gnome_desktop_minver, 3.0.0)
|
||||
m4_define(pango_minver, 1.28.3)
|
||||
m4_define(gtk_minver, 3.1.6)
|
||||
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
|
||||
index 88223cf..8d73213 100644
|
||||
--- a/libnautilus-private/nautilus-file-operations.c
|
||||
+++ b/libnautilus-private/nautilus-file-operations.c
|
||||
@@ -846,7 +846,7 @@ custom_size_to_string (char *format, va_list va)
|
||||
goffset size;
|
||||
|
||||
size = va_arg (va, goffset);
|
||||
- return g_format_size_for_display (size);
|
||||
+ return g_format_size (size);
|
||||
}
|
||||
|
||||
static void
|
||||
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
|
||||
index 55b7407..548f0c8 100644
|
||||
--- a/libnautilus-private/nautilus-file.c
|
||||
+++ b/libnautilus-private/nautilus-file.c
|
||||
@@ -5811,7 +5811,7 @@ nautilus_file_get_size_as_string (NautilusFile *file)
|
||||
if (file->details->size == -1) {
|
||||
return NULL;
|
||||
}
|
||||
- return g_format_size_for_display (file->details->size);
|
||||
+ return g_format_size (file->details->size);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5852,7 +5852,7 @@ nautilus_file_get_size_as_string_with_real_size (NautilusFile *file)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- formated = g_format_size_for_display (file->details->size);
|
||||
+ formated = g_format_size (file->details->size);
|
||||
/* Do this in a separate stage so that we don't have to put G_GUINT64_FORMAT in the translated string */
|
||||
real_size = g_strdup_printf (_("%"G_GUINT64_FORMAT), (guint64) file->details->size);
|
||||
formated_plus_real = g_strdup_printf (_("%s (%s bytes)"), formated, real_size);
|
||||
@@ -5918,7 +5918,7 @@ nautilus_file_get_deep_count_as_string_internal (NautilusFile *file,
|
||||
* directly if desired.
|
||||
*/
|
||||
if (report_size) {
|
||||
- return g_format_size_for_display (total_size);
|
||||
+ return g_format_size (total_size);
|
||||
}
|
||||
|
||||
return format_item_count_for_display (report_directory_count
|
||||
@@ -6657,7 +6657,7 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
|
||||
|
||||
res = NULL;
|
||||
if (directory->details->free_space != (guint64)-1) {
|
||||
- res = g_format_size_for_display (directory->details->free_space);
|
||||
+ res = g_format_size (directory->details->free_space);
|
||||
}
|
||||
|
||||
return res;
|
||||
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
|
||||
index 1e9d04e..3b0df9b 100644
|
||||
--- a/src/nautilus-properties-window.c
|
||||
+++ b/src/nautilus-properties-window.c
|
||||
@@ -2155,7 +2155,7 @@ directory_contents_value_field_update (NautilusPropertiesWindow *window)
|
||||
}
|
||||
} else {
|
||||
char *size_str;
|
||||
- size_str = g_format_size_for_display (total_size);
|
||||
+ size_str = g_format_size (total_size);
|
||||
text = g_strdup_printf (ngettext("%'d item, with size %s",
|
||||
"%'d items, totalling %s",
|
||||
total_count),
|
||||
@@ -2915,9 +2915,9 @@ create_pie_widget (NautilusPropertiesWindow *window)
|
||||
GFile *location;
|
||||
GFileInfo *info;
|
||||
|
||||
- capacity = g_format_size_for_display (window->details->volume_capacity);
|
||||
- free = g_format_size_for_display (window->details->volume_free);
|
||||
- used = g_format_size_for_display (window->details->volume_capacity - window->details->volume_free);
|
||||
+ capacity = g_format_size (window->details->volume_capacity);
|
||||
+ free = g_format_size (window->details->volume_free);
|
||||
+ used = g_format_size (window->details->volume_capacity - window->details->volume_free);
|
||||
|
||||
file = get_original_file (window);
|
||||
|
||||
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
|
||||
index fbd482d..7712518 100644
|
||||
--- a/src/nautilus-view.c
|
||||
+++ b/src/nautilus-view.c
|
||||
@@ -2852,7 +2852,7 @@ nautilus_view_display_selection_info (NautilusView *view)
|
||||
if (non_folder_size_known) {
|
||||
char *size_string;
|
||||
|
||||
- size_string = g_format_size_for_display (non_folder_size);
|
||||
+ size_string = g_format_size (non_folder_size);
|
||||
/* This is marked for translation in case a localiser
|
||||
* needs to use something other than parentheses. The
|
||||
* first message gives the number of items selected;
|
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 3 11:37:05 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 3.1.4:
|
||||
+ Remove the 'Create Launcher' options from the desktop
|
||||
+ Improve the 'File System' entry in the places sidebar
|
||||
+ Remove 'Clear History' from the 'Go' menu
|
||||
+ Fix location bar not expanding full width in the toolbar
|
||||
+ Use new g_format_size() instead of g_format_size_for_display()
|
||||
- Drop nautilus-replace-deprecated-function.patch: fixed upstream.
|
||||
- Drop nautilus-bnc363122-lockdown-context-menus.diff: as discussed
|
||||
upstream, in bgo#532228, this patch isn't really useful as
|
||||
actions are still available in the toolbar. So instead of
|
||||
pretending to offer a feature that is broken, it's better to not
|
||||
do anything.
|
||||
- Drop nautilus-146947-rename-bad-parameters-message.diff: this was
|
||||
marked as needing a rebase, and the upstream bug (bgo#350976) now
|
||||
has a proper patch for gvfs.
|
||||
- Drop nautilus-bgo350950-search-desktop.diff: we should use
|
||||
tracker-needle instead now, and possibly gnome-documents in the
|
||||
future.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 29 06:58:02 UTC 2011 - glin@suse.com
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
Name: nautilus
|
||||
License: GPLv2+
|
||||
Group: Productivity/File utilities
|
||||
Version: 3.1.3
|
||||
Version: 3.1.4
|
||||
Release: 1
|
||||
# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
|
||||
Summary: File Manager for the GNOME Desktop
|
||||
@ -30,18 +30,10 @@ Source1: mount-archive.desktop
|
||||
Source99: baselibs.conf
|
||||
Url: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# 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
|
||||
# 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
|
||||
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-replace-deprecated-function.patch bgo654995 glin@suse.com -- Replace g_format_size_for_display() with g_format_size() to remove 64bit-portability-issue from rpmlint
|
||||
Patch22: nautilus-replace-deprecated-function.patch
|
||||
# needed for directory ownership
|
||||
BuildRequires: dbus-1
|
||||
BuildRequires: fdupes
|
||||
@ -103,12 +95,8 @@ This package contains development files for nautilus.
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
#gnome-patch-translation-prepare
|
||||
##%patch4 -p1
|
||||
#%patch9 -p0
|
||||
### %patch15 -p1
|
||||
%patch20 -p1
|
||||
#%patch21 -p1
|
||||
%patch22 -p1
|
||||
#gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user