From 6e3d6f07f07e775e58bf6be324b06101eec17340 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Sep 25 2020 13:58:19 +0000 Subject: 2.9.1 bump --- diff --git a/.gitignore b/.gitignore index ea8a268..d460327 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,5 @@ gscan2pdf-0.9.31.tar.gz /gscan2pdf-2.8.2.tar.xz.asc /gscan2pdf-2.9.0.tar.xz /gscan2pdf-2.9.0.tar.xz.asc +/gscan2pdf-2.9.1.tar.xz +/gscan2pdf-2.9.1.tar.xz.asc diff --git a/gscan2pdf-2.9.0-Use-LC_MESSAGES-locale-category-instead-of-LANGUAGE-.patch b/gscan2pdf-2.9.0-Use-LC_MESSAGES-locale-category-instead-of-LANGUAGE-.patch deleted file mode 100644 index 343f19b..0000000 --- a/gscan2pdf-2.9.0-Use-LC_MESSAGES-locale-category-instead-of-LANGUAGE-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From aab29f9951a1276c666c1b6d2f2f923c083706ac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 21 Sep 2020 15:20:04 +0200 -Subject: [PATCH] Use LC_MESSAGES locale category instead of LANGUAGE - environment variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The LANGUAGE environment variable is a Gettext extension (in contrast -to POSIX locale) to supply a list of languages in order of -a descending preference. POSIX locale defines one language. - -While LANGUAGE is a more versatile approach, it is seldom used. POSIX -locale seems more prevalent. - -Signed-off-by: Petr Písař ---- - bin/gscan2pdf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/gscan2pdf b/bin/gscan2pdf -index 8a07e21c..91825154 100755 ---- a/bin/gscan2pdf -+++ b/bin/gscan2pdf -@@ -93,7 +93,7 @@ use English qw( -no_match_vars ) - ; # for $PERL_VERSION, $PROGRAM_NAME, $EVAL_ERROR, $ERRNO - - # To sort out LC_NUMERIC and $SIG{CHLD} --use POSIX qw(locale_h :signal_h :errno_h :sys_wait_h); -+use POSIX qw(LC_MESSAGES locale_h setlocale :signal_h :errno_h :sys_wait_h); - use Date::Calc - qw(Delta_DHMS Add_Delta_DHMS Today_and_Now Timezone Date_to_Time); - use Locale::gettext; -@@ -1543,7 +1543,7 @@ EOS - $msg .= __("OCR requires gocr, tesseract, ocropus, or cuneiform\n"); - } - if ( $dependencies{tesseract} ) { -- my $lang_msg = Gscan2pdf::Tesseract->locale_installed( $ENV{LANGUAGE} ); -+ my $lang_msg = Gscan2pdf::Tesseract->locale_installed(setlocale(LC_MESSAGES)); - if ( $lang_msg ne '1' ) { $msg .= $lang_msg } - else { - $logger->info( --- -2.25.4 - diff --git a/gscan2pdf.spec b/gscan2pdf.spec index dfbc14b..83c12f2 100644 --- a/gscan2pdf.spec +++ b/gscan2pdf.spec @@ -3,7 +3,7 @@ %bcond_without gscan2pdf_enables_test Name: gscan2pdf -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: GUI for producing a multipage PDF from a scan # icons/180_degree.svg: GPLv3 @@ -23,9 +23,6 @@ Source2: gpgkey-463293E4AE33871846F30227B321F203110FCAF3.gpg Patch0: gscan2pdf-2.8.1-Use-a-specific-font-by-ImageMagick.patch # Do not warn about missing pdftk, bug #1708054, not upstreamable Patch1: gscan2pdf-2.9.0-Do-not-warn-about-missing-pdftk.patch -# Fix an error message about an empty LANGUAGE variable, upstream bug #360, -# proposed to an upstream -Patch2: gscan2pdf-2.9.0-Use-LC_MESSAGES-locale-category-instead-of-LANGUAGE-.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: desktop-file-utils @@ -173,7 +170,6 @@ A GUI to ease the process of producing a multipage PDF from a scan. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 SHAREDIR=%{_datadir} @@ -233,6 +229,9 @@ fi %{_mandir}/man1/*.1* %changelog +* Fri Sep 25 2020 Petr Pisar - 2.9.1-1 +- 2.9.1 bump + * Mon Sep 21 2020 Petr Pisar - 2.9.0-1 - 2.9.0 bump - Fix an error message about an empty LANGUAGE variable (upstream bug #360) diff --git a/sources b/sources index f75a5e5..55d3430 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gscan2pdf-2.9.0.tar.xz) = b7488af2198f816cee45ed100d501943e8ae27e98f232574397b9deb83031444ceba44f64ff215bb324587315465cd5b50d69b94df7a6b3a62563bb40ce91a68 -SHA512 (gscan2pdf-2.9.0.tar.xz.asc) = 84e845e3f0a14437e6675dd9a94ecb8e2cc5746cef160ac82e7bb8d30ba5a204121c70620f717460dfbcbfbc66d0df9d1cfe22a6b0360aa1a754a6fbaf71c59f +SHA512 (gscan2pdf-2.9.1.tar.xz) = 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237 +SHA512 (gscan2pdf-2.9.1.tar.xz.asc) = cbbd65f2479983a073bbbb3492ce12a2247b068efb2f24aba6c5c14f870b59242dc38a5b38b2726ee47b27dbc6f46c505f775fb9ce6c8f3c08898df49459a273