From 2c93a74f8d2fa26e765394a4d6fbfd7086238fe09d0d49c16295b7e9c469a29c Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 7 Nov 2018 16:44:12 +0000 Subject: [PATCH] update OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-libintl-perl?expand=0&rev=36 --- cpanspec.yml | 4 +- disable-broken-04find_domain_bug-test.patch | 86 --------------------- libintl-perl-1.29.tar.gz | 3 - libintl-perl-1.30.tar.gz | 3 + perl-libintl-perl.changes | 60 ++------------ perl-libintl-perl.spec | 12 ++- 6 files changed, 15 insertions(+), 153 deletions(-) delete mode 100644 disable-broken-04find_domain_bug-test.patch delete mode 100644 libintl-perl-1.29.tar.gz create mode 100644 libintl-perl-1.30.tar.gz diff --git a/cpanspec.yml b/cpanspec.yml index cc44a2b..92147d9 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -8,8 +8,6 @@ description: |- #no_testing: broken upstream sources: - libintl-perl-rpmlintrc -patches: - disable-broken-04find_domain_bug-test.patch: -p1 # foo.patch: -p1 # bar.patch: preamble: |- @@ -21,7 +19,7 @@ preamble: |- # rm unused.files #post_install: |- # sed on %{name}.files -license: LGPL-2.1+ +license: GPL-3.0-or-later #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag diff --git a/disable-broken-04find_domain_bug-test.patch b/disable-broken-04find_domain_bug-test.patch deleted file mode 100644 index e0e23ab..0000000 --- a/disable-broken-04find_domain_bug-test.patch +++ /dev/null @@ -1,86 +0,0 @@ -Disable the test as it uses libc gettext which is -highly dependant on local configuration and thus unstable. - -https://github.com/gflohr/libintl-perl/issues/3 - -diff --git a/tests/04find_domain_bug.t b/tests/04find_domain_bug.t -deleted file mode 100644 -index b027d98..0000000 ---- a/tests/04find_domain_bug.t -+++ /dev/null -@@ -1,75 +0,0 @@ --#! /usr/local/bin/perl -w -- --# vim: syntax=perl --# vim: tabstop=4 -- --use strict; -- --use Test; -- --use constant NUM_TESTS => 2; -- --use Locale::Messages; --use POSIX; -- --BEGIN { -- plan tests => NUM_TESTS; --} -- --# Jan Kratochvil described the following bug: When using any functions --# from Locale::TextDomain with a locale setting for a language that --# has no message catalog installed, __find_domain() from Locale::TextDomain --# will never look into the directories "LocaleData" again. It --# tries to bindtextdomain() to all search directories, and when it --# fails to find a translation for the emtpy string (should always be --# present), it will assume that this directory is not the one holding --# the mo files. --# --# This can actually only happen, when you switch languages behind the --# user's back. Fixed by checking for the presence of _any_ (g)mo file --# in the relevant directories. --BEGIN { -- # Force language that is not supported. -- Locale::Messages::nl_putenv ("LANGUAGE=en_US"); -- Locale::Messages::nl_putenv ("LC_ALL=en_US"); -- Locale::Messages::nl_putenv ("LANG=en_US"); -- Locale::Messages::nl_putenv ("LC_MESSAGES=en_US"); -- Locale::Messages::nl_putenv ("OUTPUT_CHARSET=iso-8859-1"); -- -- Locale::Messages::setlocale (POSIX::LC_ALL() => ''); --} -- --# Make sure that LocaleData/ can befound. --BEGIN { -- unshift @INC, $1 if $0 =~ m#(.*)[\\\/]#; --} --use Locale::TextDomain ('existing'); -- --ok "February" eq __"February"; -- --Locale::Messages::nl_putenv ("LANGUAGE=de_AT"); --Locale::Messages::nl_putenv ("LC_ALL=de_AT"); --Locale::Messages::nl_putenv ("LANG=de_AT"); --Locale::Messages::nl_putenv ("LC_MESSAGES=de_AT"); -- --my $missing_locale = Locale::Messages::setlocale (POSIX::LC_ALL() => '') ? -- '' : 'locale de_AT missing'; -- --my $locale = Locale::Messages::setlocale (POSIX::LC_ALL() => ''); --my $translation = Locale::TextDomain::__("February"); --skip $missing_locale, "Feber" eq $translation; -- --__END__ -- --Local Variables: --mode: perl --perl-indent-level: 4 --perl-continued-statement-offset: 4 --perl-continued-brace-offset: 0 --perl-brace-offset: -4 --perl-brace-imaginary-offset: 0 --perl-label-offset: -4 --cperl-indent-level: 4 --cperl-continued-statement-offset: 2 --tab-width: 4 --End: diff --git a/libintl-perl-1.29.tar.gz b/libintl-perl-1.29.tar.gz deleted file mode 100644 index eb0288e..0000000 --- a/libintl-perl-1.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78935f10db6d6a080c3160b4ae02c3f6ed07ef6bf624623295a87545e0cbfbb1 -size 440973 diff --git a/libintl-perl-1.30.tar.gz b/libintl-perl-1.30.tar.gz new file mode 100644 index 0000000..dca1702 --- /dev/null +++ b/libintl-perl-1.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cdc7cfb5732eee0651be856720cb1a5996dbc04a30d0daf3c66c0b447f93108 +size 598122 diff --git a/perl-libintl-perl.changes b/perl-libintl-perl.changes index 5e5576e..a662155 100644 --- a/perl-libintl-perl.changes +++ b/perl-libintl-perl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 7 16:37:44 UTC 2018 - Dirk Stoecker + +- update to bug-fix version 1.30 + * Drop disable-broken-04find_domain_bug-test.patch (integrated upstream) + ------------------------------------------------------------------- Thu Nov 1 14:54:38 UTC 2018 - Vítězslav Čížek @@ -16,69 +22,15 @@ Fri Sep 1 06:36:11 UTC 2017 - coolo@suse.com - updated to 1.28 see /usr/share/doc/packages/perl-libintl-perl/ChangeLog - - commit 2e9b2284883b84eab39cc45eb864d6688ba2f930 - Author: Guido Flohr - Date: Thu Aug 31 21:56:12 2017 +0300 - - bumped version number to 1.28 - - commit c9cd1546061ed7b2973ea81fd2427b610c87d134 - Author: Guido Flohr - Date: Thu Aug 31 21:48:36 2017 +0300 - - git ignore in sample - - commit f25061d0fbd8a287cdaa69e1b92737cc1d4e3b90 - Author: Guido Flohr - Date: Wed Aug 30 22:52:14 2017 +0300 - editorial changes - - commit 53aab676068c1da95498c91b316d7125f8427e79 - Author: Guido Flohr - Date: Wed Aug 30 22:50:07 2017 +0300 - use new class methods for xgettext options - - commit a6e4ee63d6a33ff9b49a061d239d76a69618bf45 - Author: Guido Flohr - Date: Wed Aug 30 22:30:44 2017 +0300 - quote import tags in docs - - commit 63e7345ee6a78b172770a6910052b18bfe7e0c55 - Author: Guido Flohr - Date: Wed Aug 30 22:23:58 2017 +0300 - updated copyright date - - commit 2ac9ce9e79f51697c44e5910e2620fcd77c858b4 - Author: Guido Flohr - Date: Wed Aug 30 22:21:54 2017 +0300 - - git ignore - - commit 9a5dc45010d68cc0b8decc728b413770f27aed6b - Author: Guido Flohr - Date: Wed Aug 30 22:15:39 2017 +0300 - updated FAQ - - commit 6753d9718d605ef11627bc79082e3e8dbe23958a - Author: Guido Flohr - Date: Wed Aug 30 22:03:54 2017 +0300 - new class methods options, flags, and keywords This will produce the default keyword and flag definitions for xgettext for Locale::TextDomain. - - commit f2b9d789f3ec7176ef79c17d71d29f9b191f5909 - Author: Guido Flohr - Date: Wed Aug 30 21:57:05 2017 +0300 - - updated ChangeLog ------------------------------------------------------------------- Wed Aug 9 06:42:03 UTC 2017 - coolo@suse.com diff --git a/perl-libintl-perl.spec b/perl-libintl-perl.spec index 68388b9..a0bcf19 100644 --- a/perl-libintl-perl.spec +++ b/perl-libintl-perl.spec @@ -17,7 +17,7 @@ Name: perl-libintl-perl -Version: 1.29 +Version: 1.30 Release: 0 %define cpan_name libintl-perl Summary: High-Level Interface to Uniforum Message Translation @@ -25,10 +25,9 @@ License: GPL-3.0-or-later Group: Development/Libraries/Perl Url: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/G/GU/GUIDO/%{cpan_name}-%{version}.tar.gz +Source0: libintl-perl-1.30.tar.gz Source1: libintl-perl-rpmlintrc Source2: cpanspec.yml -# PATCH-FIX-SUSE https://github.com/gflohr/libintl-perl/issues/3 -Patch0: disable-broken-04find_domain_bug-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -47,19 +46,18 @@ for example in GNU gettext. %prep %setup -q -n %{cpan_name}-%{version} -%patch0 -p1 find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -%{__make} %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" +make %{?_smp_mflags} %check %ifarch %arm # This test blocks the qemu-arm and the worker gets stalled. Needs more attention. rm ./tests/04find_domain_bug.t %endif -%{__make} test +make test %install %perl_make_install