Update to 3.20.2

This commit is contained in:
Kalev Lember 2016-08-01 11:08:12 +02:00
parent ac7a97fa72
commit e47606a323
4 changed files with 6 additions and 37 deletions

1
.gitignore vendored
View File

@ -98,3 +98,4 @@ nautilus-2.31.6.tar.bz2
/nautilus-3.19.93.tar.xz /nautilus-3.19.93.tar.xz
/nautilus-3.20.0.tar.xz /nautilus-3.20.0.tar.xz
/nautilus-3.20.1.tar.xz /nautilus-3.20.1.tar.xz
/nautilus-3.20.2.tar.xz

View File

@ -1,32 +0,0 @@
From 6a05bf635594359baf45ef4ac3db1f9745b73d5d Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ernestask@src.gnome.org>
Date: Tue, 3 May 2016 19:03:24 +0300
Subject: [PATCH] mime-actions: use format argument
The call to gtk_message_dialog_format_secondary_text() in
show_unhandled_type_error() is missing a format argument, which causes
build failures with -Werror=format-security.
This commit adds the missing argument.
https://bugzilla.gnome.org/show_bug.cgi?id=765918
---
src/nautilus-mime-actions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 21f6246..b5e77a1 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1143,7 +1143,7 @@ show_unhandled_type_error (ActivateParametersInstall *parameters)
0,
"%s", error_message);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- text);
+ "%s", text);
g_free (text);
}
--
2.5.5

View File

@ -9,13 +9,11 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 3.20.1 Version: 3.20.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: https://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz Source: https://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-mime-actions-use-format-argument.patch
URL: https://wiki.gnome.org/Apps/Nautilus URL: https://wiki.gnome.org/Apps/Nautilus
@ -77,7 +75,6 @@ for developing nautilus extensions.
%prep %prep
%setup -q %setup -q
%patch0 -p1
#%%patch4 -p1 -b .selinux #%%patch4 -p1 -b .selinux
@ -162,6 +159,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%doc %{_datadir}/gtk-doc/html/libnautilus-extension/ %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
%changelog %changelog
* Mon Aug 01 2016 Kalev Lember <klember@redhat.com> - 3.20.2-1
- Update to 3.20.2
* Thu Jun 02 2016 Kalev Lember <klember@redhat.com> - 3.20.1-1 * Thu Jun 02 2016 Kalev Lember <klember@redhat.com> - 3.20.1-1
- Update to 3.20.1 - Update to 3.20.1

View File

@ -1 +1 @@
d25ef6e36701fc2646673bdc8f8adad2 nautilus-3.20.1.tar.xz 2971d40780778abd0584b6f80f1dd0f0 nautilus-3.20.2.tar.xz