From 6a7a68be8eaec1fac73f3acfd83ac921a24821a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2013 12:05:58 +0000 Subject: [PATCH 01/39] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From d660f53aa355973dc73a9bc99670e4221173ba4a Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 17 Jul 2013 15:23:33 +0300 Subject: [PATCH 02/39] Inital import --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 42 +++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 44 insertions(+) create mode 100644 gnome-epub-thumbnailer.spec diff --git a/.gitignore b/.gitignore index e69de29..c8ba162 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/gnome-epub-thumbnailer-1.0.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec new file mode 100644 index 0000000..f832636 --- /dev/null +++ b/gnome-epub-thumbnailer.spec @@ -0,0 +1,42 @@ +Name: gnome-epub-thumbnailer +Version: 1.0 +Release: 1%{?dist} +Summary: Thumbnailer for EPub books + +License: GPLv2+ +URL: https://git.gnome.org/browse/gnome-epub-thumbnailer +Source0: http://download.gnome.org/sources/%{name}/1.0/%{name}-%{version}.tar.xz + +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(libxml-2.0) +Buildrequires: pkgconfig(libarchive) + +%description +Thumbnailer for EPub books + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +make DESTDIR=$RPM_BUILD_ROOT install + + +%files +%{_bindir}/gnome-epub-thumbnailer +%dir %{_datadir}/thumbnailers +%{_datadir}/thumbnailers/gnome-epub-thumbnailer.thumbnailer +%doc AUTHORS COPYING README + + + +%changelog +* Tue Jul 16 2013 Yanko Kaneti - 1.0-1 +- Initial packaging diff --git a/sources b/sources index e69de29..204471a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +62003a244fa183611bd35e837b99b8e0 gnome-epub-thumbnailer-1.0.tar.xz From 36f7b0bfd782db50cee617b5daa85e74bc5819a8 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 17 Jul 2013 15:24:05 +0300 Subject: [PATCH 03/39] Add NEWS --- gnome-epub-thumbnailer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index f832636..9df8d57 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -33,7 +33,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %{_bindir}/gnome-epub-thumbnailer %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/gnome-epub-thumbnailer.thumbnailer -%doc AUTHORS COPYING README +%doc AUTHORS COPYING NEWS README From ae0d3dc90040949360cda121c033b27b61a5afe4 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 17 Jul 2013 15:54:20 +0300 Subject: [PATCH 04/39] New upstream release - 1.1 --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8ba162..d1e34a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gnome-epub-thumbnailer-1.0.tar.xz +/gnome-epub-thumbnailer-1.1.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 9df8d57..ef28654 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,11 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.0 +Version: 1.1 Release: 1%{?dist} Summary: Thumbnailer for EPub books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.0/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -38,5 +38,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Jul 17 2013 Yanko Kaneti - 1.1-1 +- New upstream release fixing possible crashes or + excessive warnings on failure + * Tue Jul 16 2013 Yanko Kaneti - 1.0-1 - Initial packaging diff --git a/sources b/sources index 204471a..c946861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62003a244fa183611bd35e837b99b8e0 gnome-epub-thumbnailer-1.0.tar.xz +f3d04f59c2cccf9c358596e229ce5bcc gnome-epub-thumbnailer-1.1.tar.xz From c9505aef4872ed0be6f67b1fa9b2d35af9413ada Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 22 Jul 2013 14:03:16 +0300 Subject: [PATCH 05/39] New upstream release adding a MOBI thumbnailer --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d1e34a1..915f964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gnome-epub-thumbnailer-1.0.tar.xz /gnome-epub-thumbnailer-1.1.tar.xz +/gnome-epub-thumbnailer-1.2.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index ef28654..96cb045 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,11 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.1 +Version: 1.2 Release: 1%{?dist} Summary: Thumbnailer for EPub books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -31,13 +31,18 @@ make DESTDIR=$RPM_BUILD_ROOT install %files %{_bindir}/gnome-epub-thumbnailer +%{_bindir}/gnome-mobi-thumbnailer %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/gnome-epub-thumbnailer.thumbnailer +%{_datadir}/thumbnailers/gnome-mobi-thumbnailer.thumbnailer %doc AUTHORS COPYING NEWS README %changelog +* Mon Jul 22 2013 Yanko Kaneti - 1.2-1 +- New upstream release adding a MOBI thumbnailer + * Wed Jul 17 2013 Yanko Kaneti - 1.1-1 - New upstream release fixing possible crashes or excessive warnings on failure diff --git a/sources b/sources index c946861..76e007a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3d04f59c2cccf9c358596e229ce5bcc gnome-epub-thumbnailer-1.1.tar.xz +ea433d29fa78997b14ac83bb91bdf116 gnome-epub-thumbnailer-1.2.tar.xz From e7a14b8b17d7781710faf149edfa7c9136f3d68a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 10:25:48 -0500 Subject: [PATCH 06/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 96cb045..49b0a53 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Thumbnailer for EPub books License: GPLv2+ @@ -40,6 +40,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jul 22 2013 Yanko Kaneti - 1.2-1 - New upstream release adding a MOBI thumbnailer From 16860320ab44cdff996ef7822e9d11732f8c7816 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 8 Aug 2013 18:34:14 +0300 Subject: [PATCH 07/39] Upstream release 1.3 Fixing a number of possible crashers in the MOBI thumbnailer --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 915f964..645c4ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gnome-epub-thumbnailer-1.0.tar.xz /gnome-epub-thumbnailer-1.1.tar.xz /gnome-epub-thumbnailer-1.2.tar.xz +/gnome-epub-thumbnailer-1.3.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 49b0a53..c2347f7 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,11 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.2 -Release: 2%{?dist} -Summary: Thumbnailer for EPub books +Version: 1.3 +Release: 1%{?dist} +Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -13,7 +13,7 @@ BuildRequires: pkgconfig(libxml-2.0) Buildrequires: pkgconfig(libarchive) %description -Thumbnailer for EPub books +Thumbnailers for EPub and MOBI books %prep @@ -40,6 +40,10 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Aug 8 2013 Yanko Kaneti - 1.3-1 +- New upstream release fixing a number of possible crashers + in the MOBI thumbnailer + * Sat Aug 03 2013 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 76e007a..1197917 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea433d29fa78997b14ac83bb91bdf116 gnome-epub-thumbnailer-1.2.tar.xz +01d078d260639c1232fb6541f33b24f4 gnome-epub-thumbnailer-1.3.tar.xz From b341bf5e05b85f44493a5c705dcaa7cf49a7f6a1 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sun, 27 Oct 2013 16:54:58 +0200 Subject: [PATCH 08/39] Don't crash on failure to find a cover file - #1001559 --- ...-error-when-the-cover-can-t-be-found.patch | 27 +++++++++++++++++++ gnome-epub-thumbnailer.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch diff --git a/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch b/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch new file mode 100644 index 0000000..251ccb1 --- /dev/null +++ b/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch @@ -0,0 +1,27 @@ +From 68841e9a7658b6bafd4d94f4199ea047d303f1d3 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Sun, 1 Sep 2013 17:26:13 +0200 +Subject: [PATCH] epub: Set an error when the cover can't be found + +This stops a crash in the thumbnailer if the cover cannot +be found. +--- + gnome-epub-thumbnailer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gnome-epub-thumbnailer.c b/gnome-epub-thumbnailer.c +index e2a3615..1cb8149 100644 +--- a/gnome-epub-thumbnailer.c ++++ b/gnome-epub-thumbnailer.c +@@ -283,7 +283,7 @@ file_to_data (const char *path, + } + + if (cover_data == NULL) { +- g_warning ("Could not find cover file in '%s'", path); ++ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Could not find cover file"); + return NULL; + } + +-- +1.8.3.1 + diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index c2347f7..95f5bb1 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,12 +1,15 @@ Name: gnome-epub-thumbnailer Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer Source0: http://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz +# Upstream commit 68841e9a7658b6bafd4d94f4199ea047d303f1d3 +Patch0: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch + BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libxml-2.0) @@ -18,6 +21,7 @@ Thumbnailers for EPub and MOBI books %prep %setup -q +%patch1 -p1 -b .crash-cover %build @@ -40,6 +44,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sun Oct 27 2013 Yanko Kaneti - 1.3-2 +- Don't crash on failure to find a cover file - #1001559 + * Thu Aug 8 2013 Yanko Kaneti - 1.3-1 - New upstream release fixing a number of possible crashers in the MOBI thumbnailer From c025f9b1a45db7ff01dafb993fb051f0941194e9 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sun, 27 Oct 2013 16:56:25 +0200 Subject: [PATCH 09/39] ugh patch typo --- gnome-epub-thumbnailer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 95f5bb1..20e66e8 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -8,7 +8,7 @@ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer Source0: http://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz # Upstream commit 68841e9a7658b6bafd4d94f4199ea047d303f1d3 -Patch0: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch +Patch1: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) From 6b40f7c5a22aa4d7d9f315336ea8ee4716e83773 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 6 Jan 2014 14:57:10 +0200 Subject: [PATCH 10/39] Some upstream fixes - Fix crashes on thumbnailing trash/recent files - #1046245 - Get unencrypted cover from otherwise encrypted mobi files --- ...to-fix-crash-with-trash-recent-files.patch | 73 +++++++++++++++++++ ...i-Don-t-bail-on-encrypted-mobi-files.patch | 33 +++++++++ gnome-epub-thumbnailer.spec | 12 ++- 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch create mode 100644 0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch diff --git a/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch b/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch new file mode 100644 index 0000000..20da236 --- /dev/null +++ b/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch @@ -0,0 +1,73 @@ +From 53d83c1a4a7f140149fec7f2aecf91034dbb3546 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 6 Jan 2014 12:45:24 +0100 +Subject: [PATCH] Update skeleton to fix crash with trash/recent files + +--- + gnome-thumbnailer-skeleton.c | 41 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 40 insertions(+), 1 deletion(-) + +diff --git a/gnome-thumbnailer-skeleton.c b/gnome-thumbnailer-skeleton.c +index b7ec3ec..e4c11a6 100644 +--- a/gnome-thumbnailer-skeleton.c ++++ b/gnome-thumbnailer-skeleton.c +@@ -34,6 +34,40 @@ static int output_size = 256; + static gboolean g_fatal_warnings = FALSE; + static char **filenames = NULL; + ++static char * ++get_target_uri (GFile *file) ++{ ++ GFileInfo *info; ++ char *target; ++ ++ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL); ++ if (info == NULL) ++ return NULL; ++ target = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)); ++ g_object_unref (info); ++ ++ return target; ++} ++ ++static char * ++get_target_path (GFile *input) ++{ ++ if (g_file_has_uri_scheme (input, "trash") != FALSE || ++ g_file_has_uri_scheme (input, "recent") != FALSE) { ++ GFile *file; ++ char *input_uri; ++ char *input_path; ++ ++ input_uri = get_target_uri (input); ++ file = g_file_new_for_uri (input_uri); ++ g_free (input_uri); ++ input_path = g_file_get_path (file); ++ g_object_unref (file); ++ return input_path; ++ } ++ return g_file_get_path (input); ++} ++ + static const GOptionEntry entries[] = { + { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL }, + {"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL}, +@@ -84,9 +118,14 @@ int main (int argc, char **argv) + } + + input = g_file_new_for_commandline_arg (filenames[0]); +- input_filename = g_file_get_path (input); ++ input_filename = get_target_path (input); + g_object_unref (input); + ++ if (input_filename == NULL) { ++ g_warning ("Could not get file path for %s", filenames[0]); ++ return 1; ++ } ++ + output = filenames[1]; + + #ifdef THUMBNAILER_RETURNS_PIXBUF +-- +1.8.5.2 + diff --git a/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch b/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch new file mode 100644 index 0000000..709a161 --- /dev/null +++ b/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch @@ -0,0 +1,33 @@ +From 675c4efafbfc1ecc9982ffcdb917fd4f73ca6a71 Mon Sep 17 00:00:00 2001 +From: Chris Lee +Date: Wed, 13 Nov 2013 01:58:30 -0800 +Subject: [PATCH] mobi: Don't bail on encrypted mobi files + +The image data isn't encrypted, so we can still generate thumbnails. + +http://wiki.mobileread.com/wiki/MOBI#MOBI_DRM +--- + gnome-mobi-thumbnailer.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c +index f7c4081..67c04bf 100644 +--- a/gnome-mobi-thumbnailer.c ++++ b/gnome-mobi-thumbnailer.c +@@ -166,13 +166,6 @@ get_image_section (GInputStream *stream, + + header = get_section_data (G_INPUT_STREAM (stream), sections, 0, &len); + +- /* Checking crypto type */ +- if (get_guint16 (header + 0xC) != 0) { +- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "File is encrypted"); +- g_free (header); +- return -1; +- } +- + /* Checking metadata availability */ + if (!(get_guint32 (header + 0x80) & 0x40)) { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "File has no metadata"); +-- +1.8.5.2 + diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 20e66e8..e52cf31 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -9,6 +9,10 @@ Source0: http://download.gnome.org/sources/%{name}/1.3/%{name}-%{version} # Upstream commit 68841e9a7658b6bafd4d94f4199ea047d303f1d3 Patch1: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch +# Upstream 675c4efafbfc1ecc9982ffcdb917fd4f73ca6a71 +Patch2: 0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch +# Upstream commit 53d83c1a4a7f140149fec7f2aecf91034dbb3546 +Patch3: 0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -21,7 +25,7 @@ Thumbnailers for EPub and MOBI books %prep %setup -q -%patch1 -p1 -b .crash-cover +%autopatch %build @@ -44,6 +48,10 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sun Oct 27 2013 Yanko Kaneti - 1.3-3 +- Fix crashes on thumbnailing trash/recent files - #1046245 +- Get unencrypted cover from otherwise encrypted mobi files + * Sun Oct 27 2013 Yanko Kaneti - 1.3-2 - Don't crash on failure to find a cover file - #1001559 From d1da759b16342330ef11173acf1a7e1fcbfb6bec Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 6 Jan 2014 14:58:22 +0200 Subject: [PATCH 11/39] fix date --- gnome-epub-thumbnailer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index e52cf31..a2b7033 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -48,7 +48,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog -* Sun Oct 27 2013 Yanko Kaneti - 1.3-3 +* Mon Jan 6 2014 Yanko Kaneti - 1.3-3 - Fix crashes on thumbnailing trash/recent files - #1046245 - Get unencrypted cover from otherwise encrypted mobi files From 477bcad3a88be83cd92981c6e4840b888d03e59e Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 16 Jan 2014 16:39:09 +0200 Subject: [PATCH 12/39] Yet another crash fix from upstream --- ...bi-Fix-parsing-garbage-with-no-cover.patch | 27 +++++++++++++++++++ gnome-epub-thumbnailer.spec | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-mobi-Fix-parsing-garbage-with-no-cover.patch diff --git a/0001-mobi-Fix-parsing-garbage-with-no-cover.patch b/0001-mobi-Fix-parsing-garbage-with-no-cover.patch new file mode 100644 index 0000000..5e05ba2 --- /dev/null +++ b/0001-mobi-Fix-parsing-garbage-with-no-cover.patch @@ -0,0 +1,27 @@ +From 3358deaeb0a2025d0bfa8458e697f0e911e2f363 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 13 Nov 2013 18:21:19 +0100 +Subject: [PATCH] mobi: Fix parsing garbage with no cover + +We were never checking the retval of get_cover_img_num() so if +no covers were found, we'd try to read index-of-first-img minus 1. +--- + gnome-mobi-thumbnailer.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c +index 67c04bf..797192a 100644 +--- a/gnome-mobi-thumbnailer.c ++++ b/gnome-mobi-thumbnailer.c +@@ -183,6 +183,8 @@ get_image_section (GInputStream *stream, + } + + image_num = get_cover_img_num (header); ++ if (image_num < 0) ++ return image_num; + + return first_img + image_num; + } +-- +1.8.5.2 + diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index a2b7033..3f0f181 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -13,6 +13,8 @@ Patch1: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch Patch2: 0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch # Upstream commit 53d83c1a4a7f140149fec7f2aecf91034dbb3546 Patch3: 0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch +# Upstream commit 3358deaeb0a2025d0bfa8458e697f0e911e2f363 +Patch4: 0001-mobi-Fix-parsing-garbage-with-no-cover.patch BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -48,6 +50,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jan 16 2014 Yanko Kaneti - 1.3-4 +- Yet another crash fix from upstream + * Mon Jan 6 2014 Yanko Kaneti - 1.3-3 - Fix crashes on thumbnailing trash/recent files - #1046245 - Get unencrypted cover from otherwise encrypted mobi files From 64e0783902db45e4db95ed76e99f1f7f98090ca1 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 24 Mar 2014 00:09:00 +0200 Subject: [PATCH 13/39] Update to 1.4. Drop upstream patches --- .gitignore | 1 + ...to-fix-crash-with-trash-recent-files.patch | 73 ------------------- ...-error-when-the-cover-can-t-be-found.patch | 27 ------- ...i-Don-t-bail-on-encrypted-mobi-files.patch | 33 --------- ...bi-Fix-parsing-garbage-with-no-cover.patch | 27 ------- gnome-epub-thumbnailer.spec | 19 ++--- sources | 2 +- 7 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch delete mode 100644 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch delete mode 100644 0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch delete mode 100644 0001-mobi-Fix-parsing-garbage-with-no-cover.patch diff --git a/.gitignore b/.gitignore index 645c4ed..0df979e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gnome-epub-thumbnailer-1.1.tar.xz /gnome-epub-thumbnailer-1.2.tar.xz /gnome-epub-thumbnailer-1.3.tar.xz +/gnome-epub-thumbnailer-1.4.tar.xz diff --git a/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch b/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch deleted file mode 100644 index 20da236..0000000 --- a/0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 53d83c1a4a7f140149fec7f2aecf91034dbb3546 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 6 Jan 2014 12:45:24 +0100 -Subject: [PATCH] Update skeleton to fix crash with trash/recent files - ---- - gnome-thumbnailer-skeleton.c | 41 ++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 40 insertions(+), 1 deletion(-) - -diff --git a/gnome-thumbnailer-skeleton.c b/gnome-thumbnailer-skeleton.c -index b7ec3ec..e4c11a6 100644 ---- a/gnome-thumbnailer-skeleton.c -+++ b/gnome-thumbnailer-skeleton.c -@@ -34,6 +34,40 @@ static int output_size = 256; - static gboolean g_fatal_warnings = FALSE; - static char **filenames = NULL; - -+static char * -+get_target_uri (GFile *file) -+{ -+ GFileInfo *info; -+ char *target; -+ -+ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL); -+ if (info == NULL) -+ return NULL; -+ target = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)); -+ g_object_unref (info); -+ -+ return target; -+} -+ -+static char * -+get_target_path (GFile *input) -+{ -+ if (g_file_has_uri_scheme (input, "trash") != FALSE || -+ g_file_has_uri_scheme (input, "recent") != FALSE) { -+ GFile *file; -+ char *input_uri; -+ char *input_path; -+ -+ input_uri = get_target_uri (input); -+ file = g_file_new_for_uri (input_uri); -+ g_free (input_uri); -+ input_path = g_file_get_path (file); -+ g_object_unref (file); -+ return input_path; -+ } -+ return g_file_get_path (input); -+} -+ - static const GOptionEntry entries[] = { - { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL }, - {"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL}, -@@ -84,9 +118,14 @@ int main (int argc, char **argv) - } - - input = g_file_new_for_commandline_arg (filenames[0]); -- input_filename = g_file_get_path (input); -+ input_filename = get_target_path (input); - g_object_unref (input); - -+ if (input_filename == NULL) { -+ g_warning ("Could not get file path for %s", filenames[0]); -+ return 1; -+ } -+ - output = filenames[1]; - - #ifdef THUMBNAILER_RETURNS_PIXBUF --- -1.8.5.2 - diff --git a/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch b/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch deleted file mode 100644 index 251ccb1..0000000 --- a/0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 68841e9a7658b6bafd4d94f4199ea047d303f1d3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Sun, 1 Sep 2013 17:26:13 +0200 -Subject: [PATCH] epub: Set an error when the cover can't be found - -This stops a crash in the thumbnailer if the cover cannot -be found. ---- - gnome-epub-thumbnailer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnome-epub-thumbnailer.c b/gnome-epub-thumbnailer.c -index e2a3615..1cb8149 100644 ---- a/gnome-epub-thumbnailer.c -+++ b/gnome-epub-thumbnailer.c -@@ -283,7 +283,7 @@ file_to_data (const char *path, - } - - if (cover_data == NULL) { -- g_warning ("Could not find cover file in '%s'", path); -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Could not find cover file"); - return NULL; - } - --- -1.8.3.1 - diff --git a/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch b/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch deleted file mode 100644 index 709a161..0000000 --- a/0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 675c4efafbfc1ecc9982ffcdb917fd4f73ca6a71 Mon Sep 17 00:00:00 2001 -From: Chris Lee -Date: Wed, 13 Nov 2013 01:58:30 -0800 -Subject: [PATCH] mobi: Don't bail on encrypted mobi files - -The image data isn't encrypted, so we can still generate thumbnails. - -http://wiki.mobileread.com/wiki/MOBI#MOBI_DRM ---- - gnome-mobi-thumbnailer.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c -index f7c4081..67c04bf 100644 ---- a/gnome-mobi-thumbnailer.c -+++ b/gnome-mobi-thumbnailer.c -@@ -166,13 +166,6 @@ get_image_section (GInputStream *stream, - - header = get_section_data (G_INPUT_STREAM (stream), sections, 0, &len); - -- /* Checking crypto type */ -- if (get_guint16 (header + 0xC) != 0) { -- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "File is encrypted"); -- g_free (header); -- return -1; -- } -- - /* Checking metadata availability */ - if (!(get_guint32 (header + 0x80) & 0x40)) { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "File has no metadata"); --- -1.8.5.2 - diff --git a/0001-mobi-Fix-parsing-garbage-with-no-cover.patch b/0001-mobi-Fix-parsing-garbage-with-no-cover.patch deleted file mode 100644 index 5e05ba2..0000000 --- a/0001-mobi-Fix-parsing-garbage-with-no-cover.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3358deaeb0a2025d0bfa8458e697f0e911e2f363 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 13 Nov 2013 18:21:19 +0100 -Subject: [PATCH] mobi: Fix parsing garbage with no cover - -We were never checking the retval of get_cover_img_num() so if -no covers were found, we'd try to read index-of-first-img minus 1. ---- - gnome-mobi-thumbnailer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c -index 67c04bf..797192a 100644 ---- a/gnome-mobi-thumbnailer.c -+++ b/gnome-mobi-thumbnailer.c -@@ -183,6 +183,8 @@ get_image_section (GInputStream *stream, - } - - image_num = get_cover_img_num (header); -+ if (image_num < 0) -+ return image_num; - - return first_img + image_num; - } --- -1.8.5.2 - diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 3f0f181..20f65ff 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,20 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.3 -Release: 4%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz - -# Upstream commit 68841e9a7658b6bafd4d94f4199ea047d303f1d3 -Patch1: 0001-epub-Set-an-error-when-the-cover-can-t-be-found.patch -# Upstream 675c4efafbfc1ecc9982ffcdb917fd4f73ca6a71 -Patch2: 0001-mobi-Don-t-bail-on-encrypted-mobi-files.patch -# Upstream commit 53d83c1a4a7f140149fec7f2aecf91034dbb3546 -Patch3: 0001-Update-skeleton-to-fix-crash-with-trash-recent-files.patch -# Upstream commit 3358deaeb0a2025d0bfa8458e697f0e911e2f363 -Patch4: 0001-mobi-Fix-parsing-garbage-with-no-cover.patch +Source0: http://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -27,7 +18,6 @@ Thumbnailers for EPub and MOBI books %prep %setup -q -%autopatch %build @@ -50,6 +40,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sun Mar 23 2014 Yanko Kaneti - 1.4-1 +- Update to 1.4. Drop upstream patches. + * Thu Jan 16 2014 Yanko Kaneti - 1.3-4 - Yet another crash fix from upstream diff --git a/sources b/sources index 1197917..bdcc2fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01d078d260639c1232fb6541f33b24f4 gnome-epub-thumbnailer-1.3.tar.xz +6327d406264c0af1b1ee6a66f14edc94 gnome-epub-thumbnailer-1.4.tar.xz From 44e0e908cf455d99abd538bfa331239713081190 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:07:48 -0500 Subject: [PATCH 14/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 20f65ff..fa21f02 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -40,6 +40,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Mar 23 2014 Yanko Kaneti - 1.4-1 - Update to 1.4. Drop upstream patches. From 41445c59b3bd1cc19176be87957abaacbd097b0f Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Tue, 5 Aug 2014 14:18:26 +0300 Subject: [PATCH 15/39] Pick couple uptream fixes. Should help avoid RHBZ 1103325 --- ...-cover-path-for-root-level-OPF-files.patch | 32 +++++++++++++++++++ ...oid-malformed-or-missing-EXTH-header.patch | 29 +++++++++++++++++ gnome-epub-thumbnailer.spec | 11 ++++++- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0001-epub-Fix-cover-path-for-root-level-OPF-files.patch create mode 100644 0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch diff --git a/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch b/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch new file mode 100644 index 0000000..0e0491f --- /dev/null +++ b/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch @@ -0,0 +1,32 @@ +From 6b8964ee5716ce6abe86d656886f3b389fa4c0cb Mon Sep 17 00:00:00 2001 +From: Chris Lee +Date: Fri, 4 Apr 2014 05:26:20 -0700 +Subject: [PATCH 1/2] epub: Fix cover path for root=level OPF files + +If the OPF file is in the root dir, g_path_get_dirname returns "." +instead of an empty string. This results in an invalid key for the cover +image, because it looks like "./OEBPS/cover_path.jpg" instead of +"OEBPS/cover_path.jpg" and then unzipping for that path fails. +--- + gnome-epub-thumbnailer.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gnome-epub-thumbnailer.c b/gnome-epub-thumbnailer.c +index b3e45e3..07aacc3 100644 +--- a/gnome-epub-thumbnailer.c ++++ b/gnome-epub-thumbnailer.c +@@ -196,7 +196,10 @@ resolve_cover_path (const char *cover_path, + char *ret; + + dirname = g_path_get_dirname (root_path); +- ret = g_build_filename (dirname, cover_path, NULL); ++ if (g_strcmp0(".", dirname) != 0) ++ ret = g_build_filename (dirname, cover_path, NULL); ++ else ++ ret = g_strdup(cover_path); + g_free (dirname); + + return ret; +-- +2.0.4 + diff --git a/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch b/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch new file mode 100644 index 0000000..56d15da --- /dev/null +++ b/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch @@ -0,0 +1,29 @@ +From 585d4b3cee54fe14eabb767dde72e4226a178ea4 Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti +Date: Sat, 31 May 2014 18:21:30 +0300 +Subject: [PATCH 2/2] mobi: Avoid malformed or missing EXTH header + +https://bugzilla.redhat.com/show_bug.cgi?id=1103325 +--- + gnome-mobi-thumbnailer.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c +index 797192a..41c5d94 100644 +--- a/gnome-mobi-thumbnailer.c ++++ b/gnome-mobi-thumbnailer.c +@@ -126,6 +126,11 @@ get_cover_img_num (const char *header) + len = get_guint32 (header + 20); + extheader = header + 16 + len; + ++ if (!g_str_equal (extheader, "EXTH")) { ++ g_warning ("Corrupt or missing EXTH header"); ++ return -1; ++ } ++ + num_items = get_guint32 (extheader + 8); + g_debug ("num extheader items: %d", num_items); + extheader = extheader + 12; +-- +2.0.4 + diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index fa21f02..0999349 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,12 +1,17 @@ Name: gnome-epub-thumbnailer Version: 1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer Source0: http://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz +# upstream 6b8964ee5716ce6abe86d656886f3b389fa4c0cb +Patch1: 0001-epub-Fix-cover-path-for-root-level-OPF-files.patch +# upstream 585d4b3cee54fe14eabb767dde72e4226a178ea4 +Patch2: 0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch + BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libxml-2.0) @@ -18,6 +23,7 @@ Thumbnailers for EPub and MOBI books %prep %setup -q +%autopatch %build @@ -40,6 +46,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Tue Aug 5 2014 Yanko Kaneti - 1.4-3 +- Pick couple uptream fixes. Should help avoid RHBZ 1103325 + * Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 09176938de0db9e75a645aa67f4be996bd162b3f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 17:45:29 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 0999349..650f3c4 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -46,6 +46,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Aug 5 2014 Yanko Kaneti - 1.4-3 - Pick couple uptream fixes. Should help avoid RHBZ 1103325 From ca95ce02ce8b168847af9cd6f7ff1da498d5ce3a Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 19 Jan 2015 17:07:20 +0200 Subject: [PATCH 17/39] Update to 1.5. Drop patches --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0df979e..0bee10b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /gnome-epub-thumbnailer-1.2.tar.xz /gnome-epub-thumbnailer-1.3.tar.xz /gnome-epub-thumbnailer-1.4.tar.xz +/gnome-epub-thumbnailer-1.5.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 650f3c4..9b94124 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,16 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.4 -Release: 4%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz - -# upstream 6b8964ee5716ce6abe86d656886f3b389fa4c0cb -Patch1: 0001-epub-Fix-cover-path-for-root-level-OPF-files.patch -# upstream 585d4b3cee54fe14eabb767dde72e4226a178ea4 -Patch2: 0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch +Source0: http://download.gnome.org/sources/%{name}/1.5/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -46,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Mon Jan 19 2015 Yanko Kaneti - 1.5-1 +- Update to 1.5. Drop patches + * Sat Aug 16 2014 Fedora Release Engineering - 1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index bdcc2fd..b73e7d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6327d406264c0af1b1ee6a66f14edc94 gnome-epub-thumbnailer-1.4.tar.xz +d9936c5240a58817a359e32cae3d4bd1 gnome-epub-thumbnailer-1.5.tar.xz From f468890d15f60e79c83d51ccfb4a636fcd2c0ccc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:52:50 +0000 Subject: [PATCH 18/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 9b94124..96c2d40 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Jan 19 2015 Yanko Kaneti - 1.5-1 - Update to 1.5. Drop patches From fdf05cd322faa07b3f32185e126b9897a59097b5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 22:24:21 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 96c2d40..acb24bb 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From b1bb75a54e3e18c285514226fe11ea21e37261e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 11:22:40 +0000 Subject: [PATCH 20/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index acb24bb..5e4e25a 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1c410cdbe765474d35858e42a433ecfef909a045 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sun, 12 Mar 2017 19:40:01 +0100 Subject: [PATCH 21/39] Remove unused patches --- ...-cover-path-for-root-level-OPF-files.patch | 32 ------------------- ...oid-malformed-or-missing-EXTH-header.patch | 29 ----------------- 2 files changed, 61 deletions(-) delete mode 100644 0001-epub-Fix-cover-path-for-root-level-OPF-files.patch delete mode 100644 0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch diff --git a/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch b/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch deleted file mode 100644 index 0e0491f..0000000 --- a/0001-epub-Fix-cover-path-for-root-level-OPF-files.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6b8964ee5716ce6abe86d656886f3b389fa4c0cb Mon Sep 17 00:00:00 2001 -From: Chris Lee -Date: Fri, 4 Apr 2014 05:26:20 -0700 -Subject: [PATCH 1/2] epub: Fix cover path for root=level OPF files - -If the OPF file is in the root dir, g_path_get_dirname returns "." -instead of an empty string. This results in an invalid key for the cover -image, because it looks like "./OEBPS/cover_path.jpg" instead of -"OEBPS/cover_path.jpg" and then unzipping for that path fails. ---- - gnome-epub-thumbnailer.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gnome-epub-thumbnailer.c b/gnome-epub-thumbnailer.c -index b3e45e3..07aacc3 100644 ---- a/gnome-epub-thumbnailer.c -+++ b/gnome-epub-thumbnailer.c -@@ -196,7 +196,10 @@ resolve_cover_path (const char *cover_path, - char *ret; - - dirname = g_path_get_dirname (root_path); -- ret = g_build_filename (dirname, cover_path, NULL); -+ if (g_strcmp0(".", dirname) != 0) -+ ret = g_build_filename (dirname, cover_path, NULL); -+ else -+ ret = g_strdup(cover_path); - g_free (dirname); - - return ret; --- -2.0.4 - diff --git a/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch b/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch deleted file mode 100644 index 56d15da..0000000 --- a/0002-mobi-Avoid-malformed-or-missing-EXTH-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 585d4b3cee54fe14eabb767dde72e4226a178ea4 Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti -Date: Sat, 31 May 2014 18:21:30 +0300 -Subject: [PATCH 2/2] mobi: Avoid malformed or missing EXTH header - -https://bugzilla.redhat.com/show_bug.cgi?id=1103325 ---- - gnome-mobi-thumbnailer.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gnome-mobi-thumbnailer.c b/gnome-mobi-thumbnailer.c -index 797192a..41c5d94 100644 ---- a/gnome-mobi-thumbnailer.c -+++ b/gnome-mobi-thumbnailer.c -@@ -126,6 +126,11 @@ get_cover_img_num (const char *header) - len = get_guint32 (header + 20); - extheader = header + 16 + len; - -+ if (!g_str_equal (extheader, "EXTH")) { -+ g_warning ("Corrupt or missing EXTH header"); -+ return -1; -+ } -+ - num_items = get_guint32 (extheader + 8); - g_debug ("num extheader items: %d", num_items); - extheader = extheader + 12; --- -2.0.4 - From eda3796e8547faf92d5fe2acf58aeb82f8d534f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:42:54 +0000 Subject: [PATCH 22/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 5e4e25a..b918b80 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c8c0222c64046e0bef596e25cceaa51410cfcfa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 22:01:58 +0000 Subject: [PATCH 23/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index b918b80..75e2d27 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From ee31874ec274b7df9526343a23db95ef710dcb32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 13:19:28 +0000 Subject: [PATCH 24/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 75e2d27..56dd418 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -41,6 +41,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2006f6952def83c2d66b8650588fbe453c9a5cda Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:45 +0200 Subject: [PATCH 25/39] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- gnome-epub-thumbnailer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 56dd418..8057f64 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -7,6 +7,7 @@ License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer Source0: http://download.gnome.org/sources/%{name}/1.5/%{name}-%{version}.tar.xz +BuildRequires: gcc BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libxml-2.0) From 0c700749a5675abdb58d16aa94aa67f3ad45eea1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:52:53 +0000 Subject: [PATCH 26/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 8057f64..fdad0b3 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7e00c396d99d0844ffdb843ff9710293d325f67b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 23:08:03 +0000 Subject: [PATCH 27/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index fdad0b3..4c9572c 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 70773612734c0961eac151ffdd3c045ab584be29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 04:08:36 +0000 Subject: [PATCH 28/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 4c9572c..36e16f5 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 189eef554d20755738d7c83bd8b51893e9bf0db0 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 30 Oct 2019 14:16:33 +0200 Subject: [PATCH 29/39] - Update to 1.6 - Adds support for SVG covers in ePub 3.0 files - Adds support for Kindle Format 8 MOBI files --- .gitignore | 1 + gnome-epub-thumbnailer.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0bee10b..98523ea 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gnome-epub-thumbnailer-1.3.tar.xz /gnome-epub-thumbnailer-1.4.tar.xz /gnome-epub-thumbnailer-1.5.tar.xz +/gnome-epub-thumbnailer-1.6.tar.xz diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 36e16f5..79a9660 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,11 +1,11 @@ Name: gnome-epub-thumbnailer -Version: 1.5 -Release: 10%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ URL: https://git.gnome.org/browse/gnome-epub-thumbnailer -Source0: http://download.gnome.org/sources/%{name}/1.5/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/1.6/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -42,6 +42,11 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Oct 30 2019 Yanko Kaneti - 1.6-1 +- Update to 1.6 +- Adds support for SVG covers in ePub 3.0 files +- Adds support for Kindle Format 8 MOBI files + * Thu Jul 25 2019 Fedora Release Engineering - 1.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b73e7d1..d2ae47f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9936c5240a58817a359e32cae3d4bd1 gnome-epub-thumbnailer-1.5.tar.xz +SHA512 (gnome-epub-thumbnailer-1.6.tar.xz) = 6311fd10ed92ecd4bc48799b6d81b1c4304760cd77540c09d7e6526aaa14516ed506f44a82aad5ce5522ec19b2d1959a14816fdf4a9e11861f576bc09e9cd3bf From 23bd554d5f59ce602d2408ceaf9d06040b226fec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 22:40:05 +0000 Subject: [PATCH 30/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 79a9660..53204dd 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Oct 30 2019 Yanko Kaneti - 1.6-1 - Update to 1.6 - Adds support for SVG covers in ePub 3.0 files From 65f9a23854d84e9ca67da24220bf7f5a8cec8007 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:34:31 +0000 Subject: [PATCH 31/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 53204dd..568579c 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From aca7d6c6a12a2dc8471086c8c7fafaa694de6758 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 02:13:45 +0000 Subject: [PATCH 32/39] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 568579c..f883903 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -42,6 +42,10 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.6-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From bc0850cf508250f8a72b0cfd938cc2e3c46a28ab Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 23:43:21 +0000 Subject: [PATCH 33/39] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gnome-epub-thumbnailer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index f883903..ec39a59 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -12,6 +12,7 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libxml-2.0) Buildrequires: pkgconfig(libarchive) +BuildRequires: make %description Thumbnailers for EPub and MOBI books From c83b8e7b4d0c2e133a12496abffe425a61f795f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:34:52 +0000 Subject: [PATCH 34/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index ec39a59..1fa3be7 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -43,6 +43,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.6-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2a601af3b211aba4aac3681fc008a5d53fc498fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 02:09:26 +0000 Subject: [PATCH 35/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 1fa3be7..d5581b3 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -43,6 +43,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From eb292606235c41b3653c718cb5ab5609ea80c12f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 06:33:10 +0000 Subject: [PATCH 36/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index d5581b3..f7ac49e 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -43,6 +43,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From aa704a95cfdd7b35e6c295a27999442727f06c22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:49:04 +0000 Subject: [PATCH 37/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index f7ac49e..136ef73 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -43,6 +43,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5996fec24ba26984f49231ded252bc5ec2f530f3 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 27 Jul 2022 19:38:37 +0200 Subject: [PATCH 38/39] bump version for epel8 --- gnome-epub-thumbnailer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-epub-thumbnailer.spec b/gnome-epub-thumbnailer.spec index 136ef73..424a883 100644 --- a/gnome-epub-thumbnailer.spec +++ b/gnome-epub-thumbnailer.spec @@ -1,6 +1,6 @@ Name: gnome-epub-thumbnailer Version: 1.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Thumbnailers for EPub and MOBI books License: GPLv2+ @@ -43,6 +43,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Jul 27 2022 Wolfgang Ulbrich - 1.6-9 +- bump version for epel8 + * Thu Jul 21 2022 Fedora Release Engineering - 1.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 89b28c9ea74b6a07f934d4f46784285671a7948a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:15:53 +0300 Subject: [PATCH 39/39] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index d2ae47f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (gnome-epub-thumbnailer-1.6.tar.xz) = 6311fd10ed92ecd4bc48799b6d81b1c4304760cd77540c09d7e6526aaa14516ed506f44a82aad5ce5522ec19b2d1959a14816fdf4a9e11861f576bc09e9cd3bf