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