From 99e1726391e6dd88407507196a981e821ab03ef3 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Oct 13 2016 08:41:05 +0000
Subject: 1.5.3 bump


---

diff --git a/.gitignore b/.gitignore
index 4f52b7e..d555697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gscan2pdf-0.9.31.tar.gz
 /gscan2pdf-1.5.0.tar.xz
 /gscan2pdf-1.5.1.tar.xz
 /gscan2pdf-1.5.2.tar.xz
+/gscan2pdf-1.5.3.tar.xz
diff --git a/gscan2pdf-1.5.2-Reset-image-depth-on-export-to-PDF.patch b/gscan2pdf-1.5.2-Reset-image-depth-on-export-to-PDF.patch
deleted file mode 100644
index e891594..0000000
--- a/gscan2pdf-1.5.2-Reset-image-depth-on-export-to-PDF.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0bdef5914f19802e7614b69c86d7f82a02c0ce56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 30 Sep 2016 15:45:24 +0200
-Subject: [PATCH] Reset image depth on export to PDF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When saving an imported PDF 1-bpp images are corrupted
-<https://bugzilla.redhat.com/show_bug.cgi?id=1369984>.
-
-This due to bug in PDF::API2
-<https://rt.cpan.org/Public/Bug/Display.html?id=118047> and a change
-in ImageMagick
-<https://github.com/ImageMagick/ImageMagick/issues/277>.
-
-This patch makes sure the image depth is preserved at conversion to
-TIFF by Image::Magick. Otherwise 8-bpp TIFFs got broken by PDF::API2.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- lib/Gscan2pdf/Document.pm | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/Gscan2pdf/Document.pm b/lib/Gscan2pdf/Document.pm
-index db7eb07..88574b9 100644
---- a/lib/Gscan2pdf/Document.pm
-+++ b/lib/Gscan2pdf/Document.pm
-@@ -2690,6 +2690,9 @@ sub _write_image_object {
-         or $downsample )
-     {
-         $logger->info("Writing temporary image $filename");
-+        # Reset depth because of ImageMagick bug
-+        # <https://github.com/ImageMagick/ImageMagick/issues/277>
-+        $image->Set('depth', $image->Get('depth'));
-         my $status = $image->Write( filename => $filename );
-         return if $_self->{cancel};
-         if ("$status") { $logger->warn($status) }
--- 
-2.7.4
-
diff --git a/gscan2pdf.spec b/gscan2pdf.spec
index bac6382..7644144 100644
--- a/gscan2pdf.spec
+++ b/gscan2pdf.spec
@@ -5,8 +5,8 @@
 %bcond_with test
 
 Name:           gscan2pdf
-Version:        1.5.2
-Release:        2%{?dist}
+Version:        1.5.3
+Release:        1%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 Group:          Applications/Publishing
 # icons/scanner.svg:    GPLv2
@@ -17,9 +17,6 @@ Group:          Applications/Publishing
 License:        GPLv3 and GPLv2 and LGPLv2+
 URL:            http://gscan2pdf.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-# Preserve image depth on PDF export, bug #1369984, proposed to upstream
-# <https://sourceforge.net/p/gscan2pdf/bugs/231/>
-Patch0:         gscan2pdf-1.5.2-Reset-image-depth-on-export-to-PDF.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
@@ -52,7 +49,7 @@ BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(FileHandle)
 BuildRequires:  perl(Filesys::Df)
 BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(Glib)
+BuildRequires:  perl(Glib) >= 1.220
 BuildRequires:  perl(Glib::Object::Subclass)
 BuildRequires:  perl(Goo::Canvas)
 BuildRequires:  perl(Gtk2) >= 1.09
@@ -139,7 +136,6 @@ A GUI to ease the process of producing a multipage PDF from a scan.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor SHAREDIR=%{_datadir}
@@ -161,18 +157,20 @@ desktop-file-install --delete-original \
 %if %{with test}
 # Disable currently failing tests
 # TODO: Fix them with upstream
-# expand_metadata_pattern subtest fails on ARM koji
-rm t/10_Document.t
 # Bad plan
 rm t/081_Frontend_CLI.t
 # file(1) reports grayscale PNM diffently
 rm t/0823_Frontend_Sane.t
+# expand_metadata_pattern subtest fails on ARM koji
+rm t/101_Document.t
 # Does not halt
 rm t/113_save_pdf_with_downsample.t
 # Mock terminates with SIGHUP on ARM koji
 rm t/114_cancel_save_pdf.t
 # ???
 rm t/1111_save_pdf.t
+# Produced test.pdf does not contain non-ASCII characters
+rm t/1123_save_pdf_with_utf8.t
 # Modification date stored in PDF depends on time zone
 rm t/115_save_pdf_with_metadata.t
 # Mock terminates with SIGHUP on i686 koji
@@ -219,6 +217,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Thu Oct 13 2016 Petr Pisar <ppisar@redhat.com> - 1.5.3-1
+- 1.5.3 bump
+
 * Fri Sep 30 2016 Petr Pisar <ppisar@redhat.com> - 1.5.2-2
 - Preserve image depth on PDF export (bug #1369984)
 
diff --git a/sources b/sources
index ce53b06..cdc1ed0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b47aa81ec8467a4cad9a19914d876015  gscan2pdf-1.5.2.tar.xz
+19bf2c8a04f70cc95902f1b24c610974  gscan2pdf-1.5.3.tar.xz