rpms/nautilus/F-13 .cvsignore, 1.106, 1.107 nautilus-2.23.5-selinux.patch, 1.3, 1.4 nautilus.spec, 1.305, 1.306 sources, 1.113, 1.114 nautilus-2.29.90-DSO-linking.patch, 1.1, NONE
Tomas Bzatek
tbzatek at fedoraproject.org
Mon Mar 15 16:07:32 UTC 2010
Author: tbzatek
Update of /cvs/extras/rpms/nautilus/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30264
Modified Files:
.cvsignore nautilus-2.23.5-selinux.patch nautilus.spec sources
Removed Files:
nautilus-2.29.90-DSO-linking.patch
Log Message:
* Mon Mar 15 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.92.1-1
- Update to 2.29.92.1
- Fix eel2 obsoletion
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-13/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore 8 Mar 2010 15:14:13 -0000 1.106
+++ .cvsignore 15 Mar 2010 16:07:31 -0000 1.107
@@ -1 +1 @@
-nautilus-2.29.92.tar.bz2
+nautilus-2.29.92.1.tar.bz2
nautilus-2.23.5-selinux.patch:
libnautilus-extension/nautilus-column.c | 17
libnautilus-extension/nautilus-column.h | 1
libnautilus-private/nautilus-column-utilities.c | 1
libnautilus-private/nautilus-file-operations.c | 38
libnautilus-private/nautilus-file-operations.h | 1
libnautilus-private/nautilus-file.c | 112 ++
libnautilus-private/nautilus-file.h | 5
src/file-manager/fm-error-reporting.c | 25
src/file-manager/fm-error-reporting.h | 5
src/file-manager/fm-list-view.c | 6
src/file-manager/fm-properties-window.c | 1167 ++++++++++++++++++++++--
11 files changed, 1292 insertions(+), 86 deletions(-)
Index: nautilus-2.23.5-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-13/nautilus-2.23.5-selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nautilus-2.23.5-selinux.patch 13 Apr 2009 19:50:18 -0000 1.3
+++ nautilus-2.23.5-selinux.patch 15 Mar 2010 16:07:32 -0000 1.4
@@ -953,7 +953,7 @@ diff -up nautilus-2.25.91-wrk/src/file-m
+ g_assert (NAUTILUS_IS_ENTRY (entry));
+ g_assert (FM_IS_PROPERTIES_WINDOW (cb_data));
+
-+ if (GTK_WIDGET_SENSITIVE (entry)) {
++ if (gtk_widget_get_state (entry)) {
+ char *tmp;
+
+ tmp = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
@@ -1151,7 +1151,7 @@ diff -up nautilus-2.25.91-wrk/src/file-m
+ dattr_t = NULL;
+ }
+
-+ if (attr_t && GTK_WIDGET_SENSITIVE (entry)) {
++ if (attr_t && gtk_widget_get_state (entry)) {
+ /* highlight just the type to the end, so we can easily change it
+ * FIXME: we also highlight any Sensitivity/MCS but completion will
+ * let people put it back, and that's the only way we get completion
Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-13/nautilus.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- nautilus.spec 8 Mar 2010 15:14:14 -0000 1.305
+++ nautilus.spec 15 Mar 2010 16:07:32 -0000 1.306
@@ -14,7 +14,7 @@
Name: nautilus
Summary: File manager for GNOME
-Version: 2.29.92
+Version: 2.29.92.1
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
@@ -69,8 +69,10 @@ Obsoletes: nautilus-suggested
Obsoletes: nautilus-mozilla < 2.0
Obsoletes: nautilus-media
-Obsoletes: gnome-volume-manager < 2.24.0-2.fc10
-Obsoletes: eel2 < 2.25.1-4.fc10
+Obsoletes: gnome-volume-manager < 2.24.0-2
+Provides: gnome-volume-manager = 2.24.0-2
+Obsoletes: eel2 < eel2-2.26.0-3
+Provides: eel2 = eel2-2.26.0-3
# Some changes to default config
Patch1: nautilus-config.patch
@@ -85,9 +87,6 @@ Patch10: nautilus-gvfs-desktop-ke
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch
-# https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
-Patch18: nautilus-2.29.90-DSO-linking.patch
-
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -125,7 +124,6 @@ for developing nautilus extensions.
# %patch8 -p1 -b .hide-white-screen
%patch10 -p1 -b .gvfs-desktop-key
%patch17 -p0 -b .symlink
-%patch18 -p1 -b .dso
%build
@@ -258,6 +256,10 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Mon Mar 15 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.92.1-1
+- Update to 2.29.92.1
+- Fix eel2 obsoletion
+
* Mon Mar 8 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.92-1
- Update to 2.29.92
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-13/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources 8 Mar 2010 15:14:14 -0000 1.113
+++ sources 15 Mar 2010 16:07:32 -0000 1.114
@@ -1 +1 @@
-e2a3c412f5ef4976680b3f180b004d41 nautilus-2.29.92.tar.bz2
+85be35d1d08d2cbdb6703911342d272d nautilus-2.29.92.1.tar.bz2
--- nautilus-2.29.90-DSO-linking.patch DELETED ---
More information about the scm-commits
mailing list