diff --git a/.gitignore b/.gitignore index 658048c..6e769e3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ gscan2pdf-0.9.31.tar.gz /gscan2pdf-1.8.3.tar.xz /gscan2pdf-1.8.4.tar.xz /gscan2pdf-1.8.5.tar.xz +/gscan2pdf-1.8.6.tar.xz diff --git a/gscan2pdf-1.8.5-Fix-unpaper-version-comparison.patch b/gscan2pdf-1.8.5-Fix-unpaper-version-comparison.patch deleted file mode 100644 index 37c91e8..0000000 --- a/gscan2pdf-1.8.5-Fix-unpaper-version-comparison.patch +++ /dev/null @@ -1,103 +0,0 @@ -From d0910d5b4c3ec09f0ccdb74e90ccc1e5a9ae71e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 22 Aug 2017 13:47:24 +0200 -Subject: [PATCH] Fix unpaper version comparison -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -unpaper versions are 0.3, 0.4.1, 5, etc. When checking for a version, -we use handy version object that requires leading "v". When printing -unpaper version, we want to print the original string without "v". - -This patch adds version_object() method for the first use case. And it -leaves version() method the the second use case. - -https://sourceforge.net/p/gscan2pdf/bugs/273/ -Signed-off-by: Petr Písař ---- - lib/Gscan2pdf/Unpaper.pm | 15 ++++++++++++++- - t/34_Unpaper.t | 8 ++++---- - 2 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/lib/Gscan2pdf/Unpaper.pm b/lib/Gscan2pdf/Unpaper.pm -index 6777732..253f336 100644 ---- a/lib/Gscan2pdf/Unpaper.pm -+++ b/lib/Gscan2pdf/Unpaper.pm -@@ -660,12 +660,13 @@ sub get_cmdline { - } - my $cmd = 'unpaper ' . join( $SPACE, @items ) . ' --overwrite '; - $cmd .= -- version->parse( $self->version ) > version->parse('v0.3') -+ $self->version_object > version->parse('v0.3') - ? '%s %s %s' - : '--input-file-sequence %s --output-file-sequence %s %s'; - return $cmd; - } - -+# Return a string or undef or $Gscan2pdf::Document::PROCESS_FAILED - sub version { - if ( not defined $version ) { - $version = -@@ -675,6 +676,18 @@ sub version { - return $version; - } - -+# Return a version object or undef -+sub version_object { -+ if (not defined $version) { -+ version(); -+ } -+ if ($version) { -+ return version::->parse('v' . $version); -+ } else { -+ return undef; -+ } -+} -+ - 1; - - __END__ -diff --git a/t/34_Unpaper.t b/t/34_Unpaper.t -index 87f55e2..ada6d9a 100644 ---- a/t/34_Unpaper.t -+++ b/t/34_Unpaper.t -@@ -18,7 +18,7 @@ is( - $unpaper->get_cmdline, - 'unpaper --black-threshold 0.33 --border-margin 0,0 --deskew-scan-direction left,right --layout single --output-pages 1 --white-threshold 0.9 --overwrite ' - . ( -- version->parse( $unpaper->version ) > version->parse('v0.3') -+ $unpaper->version_object > version->parse('v0.3') - ? '%s %s %s' - : '--input-file-sequence %s --output-file-sequence %s %s' - ), -@@ -31,7 +31,7 @@ is( - $unpaper->get_cmdline, - 'unpaper --black-threshold 0.33 --border-margin 0,0 --deskew-scan-direction left,right --layout double --output-pages 1 --white-threshold 0.9 --overwrite ' - . ( -- version->parse( $unpaper->version ) > version->parse('v0.3') -+ $unpaper->version_object > version->parse('v0.3') - ? '%s %s %s' - : '--input-file-sequence %s --output-file-sequence %s %s' - ), -@@ -76,7 +76,7 @@ is( - $unpaper->get_cmdline, - 'unpaper --black-threshold 0.35 --white-threshold 0.8 --overwrite ' - . ( -- version->parse( $unpaper->version ) > version->parse('v0.3') -+ $unpaper->version_object > version->parse('v0.3') - ? '%s %s %s' - : '--input-file-sequence %s --output-file-sequence %s %s' - ), -@@ -98,7 +98,7 @@ $unpaper->set_options( { 'output-pages' => 2 } ); - # $unpaper->get_cmdline, - #'unpaper --black-threshold 0.33 --border-margin 0,0 --deskew-scan-direction left,right --layout double --output-pages 2 --white-threshold 0.9 --overwrite ' - # . ( --# version->parse( $unpaper->version ) > version->parse('v0.3') -+# $unpaper->version_object > version->parse('v0.3') - # ? '%s %s %s' - # : '--input-file-sequence %s --output-file-sequence %s %s' - # ), --- -2.9.5 - diff --git a/gscan2pdf.spec b/gscan2pdf.spec index 6e2f7c9..d32ea3f 100644 --- a/gscan2pdf.spec +++ b/gscan2pdf.spec @@ -5,7 +5,7 @@ %bcond_with gscan2pdf_enables_test Name: gscan2pdf -Version: 1.8.5 +Version: 1.8.6 Release: 1%{?dist} Summary: GUI for producing a multipage PDF from a scan # icons/scanner.svg: GPLv2 @@ -16,9 +16,6 @@ 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 unpaper version checks, -# -Patch0: gscan2pdf-1.8.5-Fix-unpaper-version-comparison.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: desktop-file-utils @@ -151,7 +148,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 NO_PACKLIST=1 SHAREDIR=%{_datadir} @@ -231,6 +227,9 @@ fi %{_mandir}/man1/*.1* %changelog +* Wed Aug 23 2017 Petr Pisar - 1.8.6-1 +- 1.8.6 bump + * Mon Aug 21 2017 Petr Pisar - 1.8.5-1 - 1.8.5 bump diff --git a/sources b/sources index 0fc2b4d..0d5a3d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gscan2pdf-1.8.5.tar.xz) = c9ce1831214bdb48570b0a8ee93db7716315172089076a0b92b7476b442faebeb997b811615bec04e784fd0762a49935e645be1c659e2c9de09317215c71ca07 +SHA512 (gscan2pdf-1.8.6.tar.xz) = 3d33d0666e452b313a8dca91734188ab268e2fae9f0e259cd2142661a61697302bba5d602ee7395c1ffd7c87e0c52b422f9201a2b70f5211246aed359ff4092c