From e47606a32382b9f425340367bd0f0e7ea15b9372 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Aug 01 2016 09:09:01 +0000 Subject: Update to 3.20.2 --- diff --git a/.gitignore b/.gitignore index faa0552..296d87f 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-3.19.93.tar.xz /nautilus-3.20.0.tar.xz /nautilus-3.20.1.tar.xz +/nautilus-3.20.2.tar.xz diff --git a/0001-mime-actions-use-format-argument.patch b/0001-mime-actions-use-format-argument.patch deleted file mode 100644 index 1cd3c0e..0000000 --- a/0001-mime-actions-use-format-argument.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6a05bf635594359baf45ef4ac3db1f9745b73d5d Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -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 - diff --git a/nautilus.spec b/nautilus.spec index 99af47a..ea07264 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -9,13 +9,11 @@ Name: nautilus Summary: File manager for GNOME -Version: 3.20.1 +Version: 3.20.2 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops 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 @@ -77,7 +75,6 @@ for developing nautilus extensions. %prep %setup -q -%patch0 -p1 #%%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/ %changelog +* Mon Aug 01 2016 Kalev Lember - 3.20.2-1 +- Update to 3.20.2 + * Thu Jun 02 2016 Kalev Lember - 3.20.1-1 - Update to 3.20.1 diff --git a/sources b/sources index 5c3b237..a112d97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d25ef6e36701fc2646673bdc8f8adad2 nautilus-3.20.1.tar.xz +2971d40780778abd0584b6f80f1dd0f0 nautilus-3.20.2.tar.xz