From c48d0f8449b7efd385211bbbb4074b18bbdf52b2 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Feb 16 2022 11:01:40 +0000
Subject: 2.12.5 bump


---

diff --git a/.gitignore b/.gitignore
index 96da86f..5a445fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ gscan2pdf-0.9.31.tar.gz
 /gscan2pdf-2.12.3.tar.xz.asc
 /gscan2pdf-2.12.4.tar.xz
 /gscan2pdf-2.12.4.tar.xz.asc
+/gscan2pdf-2.12.5.tar.xz
+/gscan2pdf-2.12.5.tar.xz.asc
diff --git a/gscan2pdf-2.12.4-Fix-parsing-scanimage-version.patch b/gscan2pdf-2.12.4-Fix-parsing-scanimage-version.patch
deleted file mode 100644
index 87f8632..0000000
--- a/gscan2pdf-2.12.4-Fix-parsing-scanimage-version.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From de6ac3dec8c2fcdd131c6b789d847f9c0b6ae41e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 8 Feb 2022 13:24:22 +0100
-Subject: [PATCH] Fix parsing scanimage version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code needs to know a scanimage version to supply --format=pnm
-option requires since 1.0.27. The code used to compare only the last
-number (27) and that stopped working with sane-backends-1.1.1
-(1 < 27). It broke t/081_Frontend_CLI.t:
-
-    ok 43 - scanimage starts
-    not ok 44 - error callback called: Unknown message: Output format is not set, using pnm as a default.
-    #   Failed test 'error callback called: Unknown message: Output format is not set, using pnm as a default.'
-    #   at t/081_Frontend_CLI.t line 384.
-    ok 45 - scanimage scans
-    ok 46 - scanimage finishes
-
-This patch fixes it by using version module to parse the complete
-version string.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- lib/Gscan2pdf/Frontend/CLI.pm | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Gscan2pdf/Frontend/CLI.pm b/lib/Gscan2pdf/Frontend/CLI.pm
-index 0a1ee5cb..a66b8569 100644
---- a/lib/Gscan2pdf/Frontend/CLI.pm
-+++ b/lib/Gscan2pdf/Frontend/CLI.pm
-@@ -20,6 +20,7 @@ use Image::Sane ':all';    # To get SANE_NAME_PAGE_WIDTH & SANE_NAME_PAGE_HEIGHT
- use Cwd;
- use File::Spec;
- use Readonly;
-+use version;
- Readonly my $_POLL_INTERVAL               => 100;    # ms
- Readonly my $_100                         => 100;
- Readonly my $_1KB                         => 1024;
-@@ -45,9 +46,9 @@ sub setup {
-         finished_callback => sub {
-             my ( $output, $error ) = @_;
-             if ( $output =~
--                /scanimage\s[(]sane-backends[)]\s\d+[.]\d+[.](\d+)/xsm )
-+                /scanimage\s[(]sane-backends[)]\s(\d+[.]\d+[.]\d+)/xsm )
-             {
--                $_self->{version} = $1;
-+                $_self->{version} = version->parse($1);
-             }
-         }
-     );
-@@ -334,7 +335,7 @@ sub _create_scanimage_cmd {
-         }
-     }
-     if ( not $help ) {
--        if ( defined $_self->{version} and $_self->{version} gt '27' ) {
-+        if ( defined $_self->{version} and $_self->{version} > v1.0.27 ) {
-             push @options, '--format=pnm';
-         }
-         push @options, '--batch';
--- 
-2.34.1
-
diff --git a/gscan2pdf.spec b/gscan2pdf.spec
index 39054a1..b9a37df 100644
--- a/gscan2pdf.spec
+++ b/gscan2pdf.spec
@@ -3,8 +3,8 @@
 %bcond_without gscan2pdf_enables_test
 
 Name:           gscan2pdf
-Version:        2.12.4
-Release:        3%{?dist}
+Version:        2.12.5
+Release:        1%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 # icons/180_degree.svg: GPLv3
 # icons/scanner.svg:    GPLv2
@@ -23,9 +23,6 @@ Source2:        gpgkey-463293E4AE33871846F30227B321F203110FCAF3.gpg
 Patch0:         gscan2pdf-2.9.0-Do-not-warn-about-missing-pdftk.patch
 # Replace copies of gscan2pdf.svg with links, not upstreamable
 Patch1:         gscan2pdf-2.12.2-Symlink-gscan2pdf.svg-files.patch
-# Fix parsing scanimage version, proposed to the upstream,
-# <https://sourceforge.net/p/gscan2pdf/bugs/399/>
-Patch2:         gscan2pdf-2.12.4-Fix-parsing-scanimage-version.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
@@ -326,6 +323,9 @@ fi
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Feb 16 2022 Petr Pisar <ppisar@redhat.com> - 2.12.5-1
+- 2.12.5 bump
+
 * Tue Feb 08 2022 Petr Pisar <ppisar@redhat.com> - 2.12.4-3
 - Fix parsing scanimage version (upstream bug #399)
 
diff --git a/sources b/sources
index f0b1427..3edeed6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gscan2pdf-2.12.4.tar.xz) = f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486
-SHA512 (gscan2pdf-2.12.4.tar.xz.asc) = c1be34224c977b5f9e5e2c7093bf9af9667d5fd25f7560f6dcfed8d13969eb9e14260b02ea8df75122e097feb2c506acaa9e6fdb02f20f4fa040de1e17edae81
+SHA512 (gscan2pdf-2.12.5.tar.xz) = eeeec0940ef4a40b8cb7e961758e9688c94d980842ab36c4e52384099d1e28773f2967a75eb7c024ab713b880c2538d8395021bfabd68cffa7b334fdd35d773b
+SHA512 (gscan2pdf-2.12.5.tar.xz.asc) = 4205e3dc49eb8a13a7ea6cf1aa58072932f9ee60faa99d0c93423991a4c3d8bb58b31cbb124c4ebfce39c5f48d6c5d97bafa9880d653efdd44b208484da71bc4