From 625d31d860d400e89a92bb2ce8f64dc7568b07f0 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Jul 03 2017 09:30:25 +0000
Subject: 1.8.3 bump


---

diff --git a/.gitignore b/.gitignore
index c112e00..b722380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ gscan2pdf-0.9.31.tar.gz
 /gscan2pdf-1.8.0.tar.xz
 /gscan2pdf-1.8.1.tar.xz
 /gscan2pdf-1.8.2.tar.xz
+/gscan2pdf-1.8.3.tar.xz
diff --git a/gscan2pdf-1.8.3-Fix-skipping-tests-in-t-421_cuneiform.t.patch b/gscan2pdf-1.8.3-Fix-skipping-tests-in-t-421_cuneiform.t.patch
new file mode 100644
index 0000000..faaf5fd
--- /dev/null
+++ b/gscan2pdf-1.8.3-Fix-skipping-tests-in-t-421_cuneiform.t.patch
@@ -0,0 +1,29 @@
+From 995380ae6c7e1621c10f5ea9c1a3bb69f54d3c6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 3 Jul 2017 11:21:03 +0200
+Subject: [PATCH] Fix skipping tests in t/421_cuneiform.t
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/421_cuneiform.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/421_cuneiform.t b/t/421_cuneiform.t
+index 578d5ef..51cff00 100644
+--- a/t/421_cuneiform.t
++++ b/t/421_cuneiform.t
+@@ -14,7 +14,7 @@ Log::Log4perl->easy_init($WARN);
+ my $logger = Log::Log4perl::get_logger;
+ 
+ SKIP: {
+-    skip 'Cuneiform not installed', 6
++    skip 'Cuneiform not installed', 7
+       unless Gscan2pdf::Cuneiform->setup($logger);
+ 
+     # Create test image
+-- 
+2.9.4
+
diff --git a/gscan2pdf.spec b/gscan2pdf.spec
index f1ede7e..c9239d5 100644
--- a/gscan2pdf.spec
+++ b/gscan2pdf.spec
@@ -5,8 +5,8 @@
 %bcond_with gscan2pdf_enables_test
 
 Name:           gscan2pdf
-Version:        1.8.2
-Release:        2%{?dist}
+Version:        1.8.3
+Release:        1%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 # icons/scanner.svg:    GPLv2
 # icons/pdf.svg:        LGPLv2+ (copy of
@@ -16,6 +16,9 @@ Summary:        GUI for producing a multipage PDF from a scan
 License:        GPLv3 and GPLv2 and LGPLv2+
 URL:            http://gscan2pdf.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+# Fix skipping cuneiform tests,
+# <https://sourceforge.net/p/gscan2pdf/bugs/259/>
+Patch0:         gscan2pdf-1.8.3-Fix-skipping-tests-in-t-421_cuneiform.t.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
@@ -60,6 +63,7 @@ BuildRequires:  perl(HTML::Entities)
 BuildRequires:  perl(HTML::TokeParser)
 BuildRequires:  perl(if)
 BuildRequires:  perl(Image::Magick)
+BuildRequires:  perl(Image::Sane)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(IPC::Open3)
 BuildRequires:  perl(JSON::PP)
@@ -121,6 +125,7 @@ Requires:       perl(Gtk2) >= 1.09
 Recommends:     perl(Gtk2::Ex::PodViewer)
 Requires:       perl(if)
 Recommends:     perl(Image::Magick)
+Requires:       perl(Sane) >= 0.05
 Recommends:     ImageMagick
 Recommends:     ImageMagick-djvu
 Recommends:     poppler-utils
@@ -133,13 +138,14 @@ Recommends:     xdg-utils
 
 # Remove under-specified dependencies
 %global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Glib\\) >= 1\.210$
-%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Gtk2\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\((Gtk2|Sane)\\)$
 
 %description
 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 NO_PACKLIST=1 SHAREDIR=%{_datadir}
@@ -162,6 +168,7 @@ desktop-file-install --delete-original \
 # TODO: Fix them with upstream
 # Fails randomly 'Can't call method "visible" on an undefined value'
 rm t/0610_Dialog_Scan_Sane.t
+rm t/0610_Dialog_Scan_Image_Sane.t
 # Bad plan
 rm t/081_Frontend_CLI.t
 # file(1) reports grayscale PNM diffently
@@ -223,6 +230,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Jul 03 2017 Petr Pisar <ppisar@redhat.com> - 1.8.3-1
+- 1.8.3 bump
+
 * Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.2-2
 - Perl 5.26 rebuild
 
diff --git a/sources b/sources
index 4fc5002..6ab78c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gscan2pdf-1.8.2.tar.xz) = c58615520072591ae3e54196bae01b6b04015be279a5f512bb03340fe051ce75ff85f54bbf357ccefddbf54b11765c2a10afd736697a99aa20b4b8e999aef82f
+SHA512 (gscan2pdf-1.8.3.tar.xz) = ea48d3c13bd1a211b437a3d2a4514f6b74a43eead891626bee91a5ec3c5b2246b4be9cc0e2ed93da33990c03c0ba4bdf5006cf74035d0f49170fc98d4090ca3f