diff --git a/gscan2pdf-2.5.2-Do-not-warn-about-missing-pdftk.patch b/gscan2pdf-2.5.2-Do-not-warn-about-missing-pdftk.patch new file mode 100644 index 0000000..3d9c539 --- /dev/null +++ b/gscan2pdf-2.5.2-Do-not-warn-about-missing-pdftk.patch @@ -0,0 +1,35 @@ +From 19a9c54084120c0300ecc63e54a642c2f5c7aa10 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 9 May 2019 09:54:46 +0200 +Subject: [PATCH] Do not warn about missing pdftk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pdftk is not available in Fedora, do not warn about its absense. + + + +Signed-off-by: Petr Písař +--- + bin/gscan2pdf | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/bin/gscan2pdf b/bin/gscan2pdf +index 536fb998..86433477 100755 +--- a/bin/gscan2pdf ++++ b/bin/gscan2pdf +@@ -1327,10 +1327,6 @@ EOS + $msg .= __("OCR requires gocr, tesseract, ocropus, or cuneiform\n"); + } + +- if ( not $dependencies{pdftk} ) { +- $msg .= __("PDF encryption requires pdftk\n"); +- } +- + # Put up warning if needed + if ( $msg ne $EMPTY ) { + $msg = __('Warning: missing packages') . "\n$msg"; +-- +2.20.1 + diff --git a/gscan2pdf.spec b/gscan2pdf.spec index 2f14ba1..ad7608c 100644 --- a/gscan2pdf.spec +++ b/gscan2pdf.spec @@ -4,7 +4,7 @@ Name: gscan2pdf Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI for producing a multipage PDF from a scan # icons/scanner.svg: GPLv2 # icons/pdf.svg: LGPLv2+ (copy of @@ -16,6 +16,8 @@ URL: http://gscan2pdf.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz # Use specific font for ImageMagick, bug #1494563 Patch0: gscan2pdf-2.5.1-Use-specific-font-by-ImageMagick.patch +# Do not warn about missing pdftk, bug #1708054, not upstreamable +Patch1: gscan2pdf-2.5.2-Do-not-warn-about-missing-pdftk.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: desktop-file-utils @@ -113,7 +115,7 @@ BuildRequires: perl(Test::More) BuildRequires: sane-backends-drivers-scanners BuildRequires: xorg-x11-server-Xvfb # Optional tests: -# pdftk not packaged +# pdftk not packaged (bug #1708054) # poppler-utils for pdfunite # sane-frontends for scanadf BuildRequires: sane-frontends @@ -155,6 +157,7 @@ A GUI to ease the process of producing a multipage PDF from a scan. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 SHAREDIR=%{_datadir} @@ -210,6 +213,9 @@ fi %{_mandir}/man1/*.1* %changelog +* Thu May 09 2019 Petr Pisar - 2.5.2-2 +- Do not warn about missing pdftk (bug #1708054) + * Tue Apr 23 2019 Petr Pisar - 2.5.2-1 - 2.5.2 bump