From d97fc96833018381c6e59ebeb4ba8b30186c74a2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:45:17 +0000 Subject: import gnome-screenshot-3.14.0-2.el7 --- diff --git a/.gitignore b/.gitignore index 518727c..0d6915b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-screenshot-3.8.3.tar.xz +SOURCES/gnome-screenshot-3.14.0.tar.xz diff --git a/.gnome-screenshot.metadata b/.gnome-screenshot.metadata index 29886e2..1f69e6a 100644 --- a/.gnome-screenshot.metadata +++ b/.gnome-screenshot.metadata @@ -1 +1 @@ -7a982f3dee9b544dd2774904a3e19b06dc0806d3 SOURCES/gnome-screenshot-3.8.3.tar.xz +0ab91c20755caa06fa591bd67f63e94845df5835 SOURCES/gnome-screenshot-3.14.0.tar.xz diff --git a/SOURCES/filenames.patch b/SOURCES/filenames.patch new file mode 100644 index 0000000..5fd6bf4 --- /dev/null +++ b/SOURCES/filenames.patch @@ -0,0 +1,115 @@ +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 f645775..2c38550 100644 --- a/SPECS/gnome-screenshot.spec +++ b/SPECS/gnome-screenshot.spec @@ -1,12 +1,14 @@ Name: gnome-screenshot -Version: 3.8.3 -Release: 3%{?dist} +Version: 3.14.0 +Release: 2%{?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.8/gnome-screenshot-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-screenshot/3.14/gnome-screenshot-%{version}.tar.xz + +Patch0: filenames.patch BuildRequires: gtk3-devel BuildRequires: libcanberra-devel @@ -23,7 +25,7 @@ gnome-screenshot lets you take pictures of your screen. %prep %setup -q - +%patch0 -p1 -b .filenames %build %configure @@ -33,11 +35,13 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -# the desktop file contains Canonical 'enhancements' which don't validate :-( -# desktop-file-validate $RPM_BUILD_ROOT%%{_datadir}/applications/gnome-screenshot.desktop - %find_lang %{name} + +%check +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Screenshot.desktop + + %postun if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : @@ -51,25 +55,60 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %doc COPYING %{_bindir}/gnome-screenshot %{_datadir}/GConf/gsettings/gnome-screenshot.convert -%{_datadir}/applications/gnome-screenshot.desktop +%{_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 %changelog -* Fri Jan 24 2014 Daniel Mach - 3.8.3-3 -- Mass rebuild 2014-01-24 +* Thu May 14 2015 Rui Matos - 3.14.0-2 +- Don't use colons in filenames +Resolves: #1162647 + +* Tue Sep 23 2014 Kalev Lember - 3.14.0-1 +- Update to 3.14.0 + +* Tue Sep 16 2014 Kalev Lember - 3.13.92-1 +- Update to 3.13.92 + +* Fri Sep 05 2014 Kalev Lember - 3.13.90-2.gitcbdd3f5 +- Update to today's git snapshot (#1136959) + +* Thu Aug 21 2014 Kalev Lember - 3.13.90-1 +- Update to 3.13.90 +- Validate the desktop file + +* Sat Aug 16 2014 Fedora Release Engineering - 3.12.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 25 2014 Kalev Lember - 3.12.0-1 +- Update to 3.12.0 + +* Tue Feb 18 2014 Richard Hughes - 3.11.90-1 +- Update to 3.11.90 + +* Tue Nov 19 2013 Richard Hughes - 3.10.1-1 +- Update to 3.10.1 + +* Wed Sep 25 2013 Kalev Lember - 3.10.0-1 +- Update to 3.10.0 + +* Thu Aug 22 2013 Kalev Lember - 3.9.90-1 +- Update to 3.9.90 -* Fri Dec 27 2013 Daniel Mach - 3.8.3-2 -- Mass rebuild 2013-12-27 +* Sat Aug 03 2013 Fedora Release Engineering - 3.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Jul 12 2013 Rui Matos - 3.8.3-1 -- Update to 3.8.3 -- Drop upstreamed patch +* Tue Jul 16 2013 Richard Hughes - 3.9.4-1 +- Update to 3.9.4 -* Mon Jun 24 2013 Matthias Clasen - 3.8.2-2 -- Update man page +* Fri Jun 21 2013 Kalev Lember - 3.9.3-1 +- Update to 3.9.3 -* Mon May 13 2013 Matthias Clasen - 3.8.2-1 +* Tue May 14 2013 Richard Hughes - 3.8.2-1 - Update to 3.8.2 * Mon Apr 15 2013 Kalev Lember - 3.8.1-1