From 03b8fb8231de9d56553a0060b7744b5ee7573ebb Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 21 Feb 2011 23:45:31 -0500 Subject: [PATCH 01/11] Update to 2.91.90 --- .gitignore | 1 + nautilus-2.91.9-bookmark.patch | 27 --------------------------- nautilus.spec | 13 +++++++------ sources | 2 +- 4 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 nautilus-2.91.9-bookmark.patch diff --git a/.gitignore b/.gitignore index 37f08c1..e1c7be5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.7.tar.bz2 /nautilus-2.91.8.tar.bz2 /nautilus-2.91.9.tar.bz2 +/nautilus-2.91.90.tar.bz2 diff --git a/nautilus-2.91.9-bookmark.patch b/nautilus-2.91.9-bookmark.patch deleted file mode 100644 index 09127e9..0000000 --- a/nautilus-2.91.9-bookmark.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit c926b072165b822af8dfd6f5d8a413809bb6b541 -Author: Cosimo Cecchi -Date: Sat Feb 5 14:40:15 2011 -0500 - - bookmark: apply name and custom-name during construction - -diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c -index 7bc26f5..426f935 100644 ---- a/libnautilus-private/nautilus-bookmark.c -+++ b/libnautilus-private/nautilus-bookmark.c -@@ -387,14 +387,14 @@ nautilus_bookmark_class_init (NautilusBookmarkClass *class) - "Bookmark's name", - "The name of this bookmark", - NULL, -- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT); - - properties[PROP_CUSTOM_NAME] = - g_param_spec_boolean ("custom-name", - "Whether the bookmark has a custom name", - "Whether the bookmark has a custom name", - FALSE, -- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT); - - properties[PROP_LOCATION] = - g_param_spec_object ("location", diff --git a/nautilus.spec b/nautilus.spec index f744bf8..d0b57ab 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,6 +1,6 @@ -%define glib2_version 2.27.2 +%define glib2_version 2.28.0 %define pango_version 1.28 -%define gtk3_version 2.99.0 +%define gtk3_version 3.0.0 %define gnome_icon_theme_version 1.1.5 %define libxml2_version 2.4.20 %define desktop_file_utils_version 0.7 @@ -12,8 +12,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.9 -Release: 4%{?dist} +Version: 2.91.90 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 @@ -60,7 +60,6 @@ Obsoletes: eel2 < 2.26.0-3 Provides: eel2 = 2.26.0-3 # Some changes to default config -Patch1: nautilus-2.91.9-bookmark.patch Patch4: nautilus-2.91.8-selinux.patch Patch7: rtl-fix.patch @@ -101,7 +100,6 @@ for developing nautilus extensions. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .bookmark %patch4 -p1 -b .selinux %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen @@ -194,6 +192,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Mon Feb 21 2011 Cosimo Cecchi 2.91.90-1 +- Update to 2.91.90 + * Thu Feb 10 2011 Matthias Clasen 2.91.9-4 - Rebuild against newer gtk diff --git a/sources b/sources index 3867b9c..cd8d987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c5d7b98b22ceb929242ba62209b3489 nautilus-2.91.9.tar.bz2 +9ea92640bd5e28965d49c4647cb1d099 nautilus-2.91.90.tar.bz2 From 274e152a644c45b9e0ef72c3e5cf4f4c1ac64e30 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 22 Feb 2011 16:28:29 -0500 Subject: [PATCH 02/11] Update to 2.91.90.1 --- .gitignore | 1 + nautilus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1c7be5..d44354d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.8.tar.bz2 /nautilus-2.91.9.tar.bz2 /nautilus-2.91.90.tar.bz2 +/nautilus-2.91.90.1.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index d0b57ab..62745b9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -12,7 +12,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.90 +Version: 2.91.90.1 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -192,6 +192,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Tue Feb 22 2011 Cosimo Cecchi 2.91.90.1-1 +- Update to 2.91.90.1 + * Mon Feb 21 2011 Cosimo Cecchi 2.91.90-1 - Update to 2.91.90 diff --git a/sources b/sources index cd8d987..e2e16ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ea92640bd5e28965d49c4647cb1d099 nautilus-2.91.90.tar.bz2 +3af4e4f8efa5f3d30ebe0fe2af7e1ef6 nautilus-2.91.90.1.tar.bz2 From 878e0b21d56f79e5b6d040efa7152ff1571cf571 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 7 Mar 2011 20:15:38 -0500 Subject: [PATCH 03/11] Update to 2.91.91 --- .gitignore | 1 + nautilus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d44354d..96c9810 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.9.tar.bz2 /nautilus-2.91.90.tar.bz2 /nautilus-2.91.90.1.tar.bz2 +/nautilus-2.91.91.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index 62745b9..4cf2125 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,6 +1,6 @@ %define glib2_version 2.28.0 %define pango_version 1.28 -%define gtk3_version 3.0.0 +%define gtk3_version 3.0.2 %define gnome_icon_theme_version 1.1.5 %define libxml2_version 2.4.20 %define desktop_file_utils_version 0.7 @@ -12,7 +12,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.90.1 +Version: 2.91.91 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -192,6 +192,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Mon Mar 07 2011 Cosimo Cecchi 2.91.91-1 +- Update to 2.91.91 + * Tue Feb 22 2011 Cosimo Cecchi 2.91.90.1-1 - Update to 2.91.90.1 diff --git a/sources b/sources index e2e16ff..8728b5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3af4e4f8efa5f3d30ebe0fe2af7e1ef6 nautilus-2.91.90.1.tar.bz2 +471760344a7395c41288ac1f287b91f2 nautilus-2.91.91.tar.bz2 From f48f23f022c1c7aa3c0bc3d7962401328af8f4c9 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 7 Mar 2011 20:30:23 -0500 Subject: [PATCH 04/11] Ship the service file --- nautilus.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nautilus.spec b/nautilus.spec index 4cf2125..3205e2a 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -169,6 +169,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %{_bindir}/* %{_datadir}/icons/hicolor/*/apps/nautilus.png %{_datadir}/icons/hicolor/scalable/apps/nautilus.svg +%{_datadir}/dbus-1/services/org.gnome.Nautilus.service %{_mandir}/man1/nautilus-connect-server.1.gz %{_mandir}/man1/nautilus.1.gz %{_libexecdir}/nautilus-convert-metadata From ec0e075d3e9e7eab7ce5c7bb8f30edd398f7fc15 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 21 Mar 2011 18:29:14 -0400 Subject: [PATCH 05/11] Update to 2.91.92 --- .gitignore | 1 + nautilus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 96c9810..c230b43 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.90.tar.bz2 /nautilus-2.91.90.1.tar.bz2 /nautilus-2.91.91.tar.bz2 +/nautilus-2.91.92.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index 3205e2a..c693b5e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -12,7 +12,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.91 +Version: 2.91.92 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -193,6 +193,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Mon Mar 21 2011 Cosimo Cecchi - 2.91.92-1 +- Update to 2.91.92 + * Mon Mar 07 2011 Cosimo Cecchi 2.91.91-1 - Update to 2.91.91 diff --git a/sources b/sources index 8728b5c..8a5fd92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -471760344a7395c41288ac1f287b91f2 nautilus-2.91.91.tar.bz2 +eccf0b30469bc70622c77161af8cb1d7 nautilus-2.91.92.tar.bz2 From 8f2b1fa2eda8e688cbd384ccfd2dc62aadd6328a Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 21 Mar 2011 19:19:52 -0400 Subject: [PATCH 06/11] Remove obsolete patch --- nautilus-578086-po.patch | 24 ------------------------ nautilus.spec | 6 ------ 2 files changed, 30 deletions(-) delete mode 100644 nautilus-578086-po.patch diff --git a/nautilus-578086-po.patch b/nautilus-578086-po.patch deleted file mode 100644 index 166ce47..0000000 --- a/nautilus-578086-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/po/bn.po b/po/bn.po -index 353931f..d7c5618 100644 ---- a/po/bn.po -+++ b/po/bn.po -@@ -2306,14 +2306,14 @@ msgstr "\"%B\"-এর অনুলিপি তৈরি করা হচ্ছ - #: ../libnautilus-private/nautilus-file-operations.c:2864 - msgid "Moving %'d file (in \"%B\") to \"%B\"" - msgid_plural "Moving %'d files (in \"%B\") to \"%B\"" --msgstr[0] " \"%1$B\"-এ উপস্থিত %2$d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" --msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে" -+msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" -+msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" - - #: ../libnautilus-private/nautilus-file-operations.c:2868 - msgid "Copying %'d file (in \"%B\") to \"%B\"" - msgid_plural "Copying %'d files (in \"%B\") to \"%B\"" --msgstr[0] " \"%1$B\"-এ উপস্থিত %2$'d ফাইল \"%3$B\"-এ অনুলিপি হচ্ছে" --msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে" -+msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ অনুলিপি হচ্ছে" -+msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে" - - #: ../libnautilus-private/nautilus-file-operations.c:2876 - msgid "Duplicating %'d file (in \"%B\")" - diff --git a/nautilus.spec b/nautilus.spec index c693b5e..3bb0e8c 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -65,10 +65,6 @@ Patch4: nautilus-2.91.8-selinux.patch Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch -# [bn_IN, gu_IN][nautilus] - Its crashing, when drag any file -# https://bugzilla.redhat.com/show_bug.cgi?id=583559 -Patch23: nautilus-578086-po.patch - %description Nautilus is the file manager and graphical shell for the GNOME desktop that makes it easy to manage your files and the rest of your system. @@ -102,8 +98,6 @@ for developing nautilus extensions. %patch4 -p1 -b .selinux %patch7 -p1 -b .rtl-fix -# %patch8 -p1 -b .hide-white-screen -%patch23 -p1 -b .gu_IN-crash %build From 180402fdacf20e114ee53ab8bc84d6f770bc16fc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 25 Mar 2011 23:22:13 -0400 Subject: [PATCH 07/11] 2.9193 --- .gitignore | 1 + nautilus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c230b43..3580ddb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.90.1.tar.bz2 /nautilus-2.91.91.tar.bz2 /nautilus-2.91.92.tar.bz2 +/nautilus-2.91.93.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index 3bb0e8c..426d66a 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -12,7 +12,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.92 +Version: 2.91.93 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -187,6 +187,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Fri Mar 25 2011 Matthias Clasen - 2.91.93-1 +- Update to 2.91.93 + * Mon Mar 21 2011 Cosimo Cecchi - 2.91.92-1 - Update to 2.91.92 diff --git a/sources b/sources index 8a5fd92..3b7cea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eccf0b30469bc70622c77161af8cb1d7 nautilus-2.91.92.tar.bz2 +0c6e265ca18e1ad00a0cb0a500d28ee9 nautilus-2.91.93.tar.bz2 From 06e4e7387bda382461e05dd8c6860e701e2d1083 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 27 Mar 2011 14:40:37 -0400 Subject: [PATCH 08/11] Drop --vendor from nautilus.desktop Vendor prefixes are pointless, and in this case breaks upstream components trying to reference each other via .desktop file, such as GNOME Shell having nautilus.desktop in its default favorite list. --- nautilus.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nautilus.spec b/nautilus.spec index 426d66a..1b8fa4d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -13,7 +13,7 @@ Name: nautilus Summary: File manager for GNOME Version: 2.91.93 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 @@ -121,7 +121,7 @@ LANG=en_US make %{?_smp_mflags} V=1 export tagname=CC LANG=en_US make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -desktop-file-install --vendor gnome --delete-original \ +desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/* @@ -187,6 +187,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Sun Mar 27 2011 Colin Walters - 2.91.93-2 +- Drop --vendor from nautilus.desktop + Vendor prefixes are pointless, and in this case breaks upstream + components trying to reference each other via .desktop file, such + as GNOME Shell having nautilus.desktop in its default favorite + list. + * Fri Mar 25 2011 Matthias Clasen - 2.91.93-1 - Update to 2.91.93 From c164e759c70d14caf52ac1074bbb08a819173cc7 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 30 Mar 2011 22:10:17 -0400 Subject: [PATCH 09/11] Update to 2.91.94 --- .gitignore | 1 + nautilus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3580ddb..07e679c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.91.tar.bz2 /nautilus-2.91.92.tar.bz2 /nautilus-2.91.93.tar.bz2 +/nautilus-2.91.94.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index 1b8fa4d..541f054 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -12,8 +12,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.93 -Release: 2%{?dist} +Version: 2.91.94 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 @@ -187,6 +187,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Wed Mar 30 2011 Cosimo Cecchi - 2.91.94-1 +- Update to 2.91.94 + * Sun Mar 27 2011 Colin Walters - 2.91.93-2 - Drop --vendor from nautilus.desktop Vendor prefixes are pointless, and in this case breaks upstream diff --git a/sources b/sources index 3b7cea4..cd3db2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c6e265ca18e1ad00a0cb0a500d28ee9 nautilus-2.91.93.tar.bz2 +8b849213a92f625d9b5c41000a1e0bb7 nautilus-2.91.94.tar.bz2 From b19a558dc6f04f8eb88d4b0b1667976e391a03e9 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 4 Apr 2011 12:08:48 -0400 Subject: [PATCH 10/11] Update to 3.0.0 --- nautilus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nautilus.spec b/nautilus.spec index 541f054..7dadf6a 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -12,7 +12,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.91.94 +Version: 3.0.0 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -187,6 +187,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/* %changelog +* Mon Apr 04 2011 Cosimo Cecchi - 3.0.0-1 +- Update to 3.0.0 + * Wed Mar 30 2011 Cosimo Cecchi - 2.91.94-1 - Update to 2.91.94 From 3ee43591477503b2efa1562376db15c3955a44ca Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Mon, 4 Apr 2011 12:12:30 -0400 Subject: [PATCH 11/11] Actually update the sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 07e679c..97971ff 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-2.91.92.tar.bz2 /nautilus-2.91.93.tar.bz2 /nautilus-2.91.94.tar.bz2 +/nautilus-3.0.0.tar.bz2 diff --git a/sources b/sources index cd3db2d..715687f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b849213a92f625d9b5c41000a1e0bb7 nautilus-2.91.94.tar.bz2 +9adbdb30d988e4a200fc76863b3bafae nautilus-3.0.0.tar.bz2