From d60cf1376bc44937e6f2668b1599599352fa2e9f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:49:33 +0000 Subject: import gnome-screenshot-3.22.0-1.el7 --- diff --git a/.gitignore b/.gitignore index 0d6915b..96c2475 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-screenshot-3.14.0.tar.xz +SOURCES/gnome-screenshot-3.22.0.tar.xz diff --git a/.gnome-screenshot.metadata b/.gnome-screenshot.metadata index 1f69e6a..5bcc943 100644 --- a/.gnome-screenshot.metadata +++ b/.gnome-screenshot.metadata @@ -1 +1 @@ -0ab91c20755caa06fa591bd67f63e94845df5835 SOURCES/gnome-screenshot-3.14.0.tar.xz +210194845842c9273d8ba6bc60403beaaf27f75f SOURCES/gnome-screenshot-3.22.0.tar.xz diff --git a/SOURCES/0001-Updated-Italian-translation.patch b/SOURCES/0001-Updated-Italian-translation.patch deleted file mode 100644 index b1c63c6..0000000 --- a/SOURCES/0001-Updated-Italian-translation.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 44a942711a29438dee4e0dc3710009f7306ab1ca Mon Sep 17 00:00:00 2001 -From: Milo Casagrande -Date: Sun, 5 Oct 2014 13:50:43 +0000 -Subject: [PATCH] Updated Italian translation - ---- - po/it.po | 87 +++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 45 insertions(+), 42 deletions(-) - -diff --git a/po/it.po b/po/it.po -index 697a55f..46aca81 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -1,20 +1,20 @@ - # Italian traslation of gnome-screenshot --# Copyright (C) 1998-2011, 2012, 2013 Free Software Foundation, Inc. -+# Copyright (C) 1998-2011, 2012, 2013, 2014 Free Software Foundation, Inc. - # This file is released under the same license as the gnome-screenshot package. - # Alessio Frusciante , 2003, 2005. - # Lapo Calamandrei , 2003. - # Luca Ferretti , 2004. - # Fabio Marzocca , 2007. - # Andrea Zagli , 2005, 2006, 2007, 2008, 2009, 2010, 2011. --# Milo Casagrande , 2012, 2013. -+# Milo Casagrande , 2012, 2013, 2014. - # - msgid "" - msgstr "" - "Project-Id-Version: gnome-screenshot\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "screenshot&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2014-02-28 08:19+0000\n" --"PO-Revision-Date: 2014-02-28 18:29+0100\n" -+"POT-Creation-Date: 2014-10-05 07:31+0000\n" -+"PO-Revision-Date: 2014-10-05 15:49+0100\n" - "Last-Translator: Milo Casagrande \n" - "Language-Team: Italian \n" - "Language: it\n" -@@ -22,27 +22,28 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" --"X-Generator: Poedit 1.6.4\n" -+"X-Generator: Poedit 1.6.9\n" - --#: ../src/gnome-screenshot.desktop.in.h:1 ../src/screenshot-application.c:790 -+#: ../src/org.gnome.Screenshot.desktop.in.h:1 -+#: ../src/screenshot-application.c:767 - msgid "Screenshot" - msgstr "Schermata" - --#: ../src/gnome-screenshot.desktop.in.h:2 ../src/screenshot-application.c:791 -+#: ../src/org.gnome.Screenshot.desktop.in.h:2 -+#: ../src/screenshot-application.c:768 - msgid "Save images of your screen or individual windows" - msgstr "Salva immagini dello schermo o di singole finestre" - --#: ../src/gnome-screenshot.desktop.in.h:3 --#| msgid "snapshot;capture;print;" -+#: ../src/org.gnome.Screenshot.desktop.in.h:3 - msgid "snapshot;capture;print;screenshot;" - msgstr "schermata;schermate;cattura;stampa;screenshot;snapshot;" - - # (ndt) ripetitiva, ma almeno c'รจ consistenza nella terminologia --#: ../src/gnome-screenshot.desktop.in.h:4 -+#: ../src/org.gnome.Screenshot.desktop.in.h:4 - msgid "Take a Screenshot of the Whole Screen" - msgstr "Cattura una schermata dell'interno schermo" - --#: ../src/gnome-screenshot.desktop.in.h:5 -+#: ../src/org.gnome.Screenshot.desktop.in.h:5 - msgid "Take a Screenshot of the Current Window" - msgstr "Cattura una schermata della finestra corrente" - -@@ -190,72 +191,67 @@ msgstr "Cattura schermata" - msgid "All possible methods failed" - msgstr "Tutti i possibili metodi non sono riusciti" - --#: ../src/screenshot-application.c:645 -+#: ../src/screenshot-application.c:631 - msgid "Send the grab directly to the clipboard" - msgstr "Invia quanto catturato agli appunti" - --#: ../src/screenshot-application.c:646 -+#: ../src/screenshot-application.c:632 - msgid "Grab a window instead of the entire screen" - msgstr "Cattura una finestra invece dello schermo intero" - --#: ../src/screenshot-application.c:647 -+#: ../src/screenshot-application.c:633 - msgid "Grab an area of the screen instead of the entire screen" - msgstr "Cattura un'area dello schermo invece dello schermo intero" - --#: ../src/screenshot-application.c:648 -+#: ../src/screenshot-application.c:634 - msgid "Include the window border with the screenshot" - msgstr "Nella schermata catturata include il bordo della finestra" - --#: ../src/screenshot-application.c:649 -+#: ../src/screenshot-application.c:635 - msgid "Remove the window border from the screenshot" - msgstr "Rimuove il bordo della finestra dalla schermata" - --#: ../src/screenshot-application.c:650 -+#: ../src/screenshot-application.c:636 - msgid "Include the pointer with the screenshot" - msgstr "Include il puntatore nella schermata" - --#: ../src/screenshot-application.c:651 -+#: ../src/screenshot-application.c:637 - msgid "Take screenshot after specified delay [in seconds]" - msgstr "Cattura una schermata dopo il ritardo specificato (in secondi)" - - #. translators: this is the last part of the "grab after a - #. * delay of seconds". - #. --#: ../src/screenshot-application.c:651 --#: ../src/screenshot-interactive-dialog.c:421 -+#: ../src/screenshot-application.c:637 -+#: ../src/screenshot-interactive-dialog.c:420 - msgid "seconds" - msgstr "secondi" - --#: ../src/screenshot-application.c:652 --#| msgid "Effect to add to the border (shadow, border or none)" -+#: ../src/screenshot-application.c:638 - msgid "Effect to add to the border (shadow, border, vintage or none)" - msgstr "Effetto da aggiungere al bordo (ombra, bordo, vintage o nessuno)" - --#: ../src/screenshot-application.c:652 -+#: ../src/screenshot-application.c:638 - msgid "effect" - msgstr "effetto" - --#: ../src/screenshot-application.c:653 -+#: ../src/screenshot-application.c:639 - msgid "Interactively set options" - msgstr "Imposta opzioni interattivamente" - --#: ../src/screenshot-application.c:654 -+#: ../src/screenshot-application.c:640 - msgid "Save screenshot directly to this file" - msgstr "Salva la schermata direttamente su questo file" - --#: ../src/screenshot-application.c:654 -+#: ../src/screenshot-application.c:640 - msgid "filename" - msgstr "nomefile" - --#: ../src/screenshot-application.c:655 -+#: ../src/screenshot-application.c:641 - msgid "Print version information and exit" - msgstr "Stampa la versione ed esce" - --#: ../src/screenshot-application.c:669 --msgid "Take a picture of the screen" --msgstr "Cattura un'immagine dello schermo" -- --#: ../src/screenshot-application.c:793 -+#: ../src/screenshot-application.c:770 - msgid "translator-credits" - msgstr "" - "Milo Casagrande \n" -@@ -263,7 +259,7 @@ msgstr "" - "Fabio Marzocca \n" - "Andrea Zagli " - --#: ../src/screenshot-config.c:59 -+#: ../src/screenshot-config.c:116 - #, c-format - msgid "" - "Conflicting options: --window and --area should not be used at the same " -@@ -272,7 +268,7 @@ msgstr "" - "Opzioni in conflitto: --window e --area non possono essere utilizzate allo " - "stesso tempo.\n" - --#: ../src/screenshot-config.c:66 -+#: ../src/screenshot-config.c:123 - #, c-format - msgid "" - "Conflicting options: --area and --delay should not be used at the same " -@@ -330,41 +326,48 @@ msgstr "Includi il _bordo finestra" - msgid "Apply _effect:" - msgstr "Applica _effetto:" - --#: ../src/screenshot-interactive-dialog.c:355 -+#: ../src/screenshot-interactive-dialog.c:354 - msgid "Grab the whole sc_reen" - msgstr "Cattura l'intero schermo" - --#: ../src/screenshot-interactive-dialog.c:369 -+#: ../src/screenshot-interactive-dialog.c:368 - msgid "Grab the current _window" - msgstr "Cattura la _finestra corrente" - --#: ../src/screenshot-interactive-dialog.c:381 -+#: ../src/screenshot-interactive-dialog.c:380 - msgid "Select _area to grab" - msgstr "Seleziona l'_area da catturare" - - #. translators: this is the first part of the "grab after a - #. * delay of seconds". - #. --#: ../src/screenshot-interactive-dialog.c:401 -+#: ../src/screenshot-interactive-dialog.c:400 - msgid "Grab after a _delay of" - msgstr "C_attura dopo un ritardo di" - --#: ../src/screenshot-interactive-dialog.c:470 -+#: ../src/screenshot-interactive-dialog.c:469 - msgid "Take Screenshot" - msgstr "Cattura schermata" - --#: ../src/screenshot-interactive-dialog.c:471 -+#: ../src/screenshot-interactive-dialog.c:470 - msgid "Effects" - msgstr "Effetti" - --#: ../src/screenshot-interactive-dialog.c:493 -+#: ../src/screenshot-interactive-dialog.c:483 -+msgid "_Help" -+msgstr "A_iuto" -+ -+#: ../src/screenshot-interactive-dialog.c:492 - msgid "Take _Screenshot" - msgstr "Cattura _schermata" - --#: ../src/screenshot-interactive-dialog.c:510 -+#: ../src/screenshot-interactive-dialog.c:509 - msgid "_Cancel" - msgstr "A_nnulla" - - #: ../src/screenshot-utils.c:724 - msgid "Error loading the help page" - msgstr "Errore nel caricare la pagina della guida" -+ -+#~ msgid "Take a picture of the screen" -+#~ msgstr "Cattura un'immagine dello schermo" --- -2.5.0 - diff --git a/SOURCES/filenames.patch b/SOURCES/filenames.patch deleted file mode 100644 index 5fd6bf4..0000000 --- a/SOURCES/filenames.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 3e562332b4acf4f66e2721b12bc8a31379b45815 Mon Sep 17 00:00:00 2001 -From: Philippe Coval -Date: Wed, 24 Apr 2013 15:45:05 +0200 -Subject: [PATCH 1/3] Build more convenient filenames (no ':' or ' ') - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=698740 ---- - src/screenshot-filename-builder.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c -index b1d8e53..4e5c62a 100644 ---- a/src/screenshot-filename-builder.c -+++ b/src/screenshot-filename-builder.c -@@ -132,7 +132,7 @@ build_path (AsyncExistenceJob *job) - GDateTime *d; - - d = g_date_time_new_now_local (); -- origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S"); -+ origin = g_date_time_format (d, "%Y-%m-%d-%H%M%S"); - g_date_time_unref (d); - } - else -@@ -142,14 +142,14 @@ build_path (AsyncExistenceJob *job) - { - /* translators: this is the name of the file that gets made up - * with the screenshot if the entire screen is taken */ -- file_name = g_strdup_printf (_("Screenshot from %s.%s"), origin, file_type); -+ file_name = g_strdup_printf (_("Screenshot-from-%s.%s"), origin, file_type); - } - else - { - /* translators: this is the name of the file that gets - * made up with the screenshot if the entire screen is - * taken */ -- file_name = g_strdup_printf (_("Screenshot from %s - %d.%s"), origin, job->iteration, file_type); -+ file_name = g_strdup_printf (_("Screenshot-from-%s-%d.%s"), origin, job->iteration, file_type); - } - - retval = g_build_filename (base_path, file_name, NULL); --- -2.4.0 - -From 840603fb31dfde18aeff5dab89a704754082d86c Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi -Date: Wed, 28 Jan 2015 12:40:34 +0000 -Subject: [PATCH 2/3] filename-builder: reintroduce spaces in file names - -In commit 51485cf6bf8a8794150be0b8dff61fd573ae1512 we removed colons and -spaces from the screenshot default filenames, but removing spaces is -not really needed for the purpose of the patch (compatibility with FAT -filesystems) and it looks bad. Bring spaces back. ---- - src/screenshot-filename-builder.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c -index 4e5c62a..9d8ee76 100644 ---- a/src/screenshot-filename-builder.c -+++ b/src/screenshot-filename-builder.c -@@ -132,7 +132,7 @@ build_path (AsyncExistenceJob *job) - GDateTime *d; - - d = g_date_time_new_now_local (); -- origin = g_date_time_format (d, "%Y-%m-%d-%H%M%S"); -+ origin = g_date_time_format (d, "%Y-%m-%d %H%M%S"); - g_date_time_unref (d); - } - else -@@ -142,14 +142,14 @@ build_path (AsyncExistenceJob *job) - { - /* translators: this is the name of the file that gets made up - * with the screenshot if the entire screen is taken */ -- file_name = g_strdup_printf (_("Screenshot-from-%s.%s"), origin, file_type); -+ file_name = g_strdup_printf (_("Screenshot from %s.%s"), origin, file_type); - } - else - { - /* translators: this is the name of the file that gets - * made up with the screenshot if the entire screen is - * taken */ -- file_name = g_strdup_printf (_("Screenshot-from-%s-%d.%s"), origin, job->iteration, file_type); -+ file_name = g_strdup_printf (_("Screenshot from %s - %d.%s"), origin, job->iteration, file_type); - } - - retval = g_build_filename (base_path, file_name, NULL); --- -2.4.0 - -From 170b6ad5e7c8294f725e53102b63a6e587c5da40 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi -Date: Wed, 28 Jan 2015 12:43:58 +0000 -Subject: [PATCH 3/3] filename-builder: use dash for time format separator - -We can't use colons, but a separator here still looks nice. Use a dash. ---- - src/screenshot-filename-builder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c -index 9d8ee76..89df3e0 100644 ---- a/src/screenshot-filename-builder.c -+++ b/src/screenshot-filename-builder.c -@@ -132,7 +132,7 @@ build_path (AsyncExistenceJob *job) - GDateTime *d; - - d = g_date_time_new_now_local (); -- origin = g_date_time_format (d, "%Y-%m-%d %H%M%S"); -+ origin = g_date_time_format (d, "%Y-%m-%d %H-%M-%S"); - g_date_time_unref (d); - } - else --- -2.4.0 - diff --git a/SPECS/gnome-screenshot.spec b/SPECS/gnome-screenshot.spec index 0c52b53..cb320d4 100644 --- a/SPECS/gnome-screenshot.spec +++ b/SPECS/gnome-screenshot.spec @@ -1,33 +1,29 @@ Name: gnome-screenshot -Version: 3.14.0 -Release: 3%{?dist} +Version: 3.22.0 +Release: 1%{?dist} Summary: A screenshot utility for GNOME -Group: Applications/System License: GPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-screenshot/3.14/gnome-screenshot-%{version}.tar.xz - -Patch0: filenames.patch -Patch1: 0001-Updated-Italian-translation.patch +Source0: http://download.gnome.org/sources/gnome-screenshot/3.22/gnome-screenshot-%{version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libcanberra-devel BuildRequires: intltool BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib Obsoletes: gnome-utils <= 1:3.3 Obsoletes: gnome-utils-libs <= 1:3.3 Obsoletes: gnome-utils-devel <= 1:3.3 - %description gnome-screenshot lets you take pictures of your screen. + %prep %setup -q -%patch0 -p1 -b .filenames -%patch1 -p1 -b .italian-translation + %build %configure @@ -35,7 +31,7 @@ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %find_lang %{name} @@ -54,15 +50,20 @@ fi glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f %{name}.lang -%doc COPYING +%license COPYING %{_bindir}/gnome-screenshot %{_datadir}/GConf/gsettings/gnome-screenshot.convert +%{_datadir}/appdata/org.gnome.Screenshot.appdata.xml %{_datadir}/applications/org.gnome.Screenshot.desktop %{_datadir}/dbus-1/services/org.gnome.Screenshot.service %{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml -%doc %{_mandir}/man1/gnome-screenshot.1.gz +%{_mandir}/man1/gnome-screenshot.1* %changelog +* Thu Feb 23 2017 Matthias Clasen - 3.22.0-1 +- Rebase to 3.22.0 + Resolves: rhbz#1386956 + * Mon Feb 8 2016 Rui Matos - 3.14.0-3 - Update Italian translation Resolves: #1272498