[Lsb-messages] /var/www/bzr/lsb/devel/perl-test r109: drop perl Locale::Constants (bug 3282)

[Mats Wichmann]

------------------------------------------------------------
revno: 109
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: perl-test
timestamp: Mon 2015-02-02 16:40:42 -0700
message:
  drop perl Locale::Constants (bug 3282)
added:
  scripts/package/perl-test-bug-3282.patch
modified:
  scripts/package/Makefile
  scripts/package/lsb-test-perl.spec.sed
  scripts/package/tst_perlModPresent.pl
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2015-01-31 13:20:58 +0000
+++ b/scripts/package/Makefile	2015-02-02 23:40:42 +0000
@@ -1,7 +1,7 @@
 # XXX We should play the usual tricks defining stuff here and building
 # XXX a specfile from this info, but not yet: for now keep in sync
 PACKAGE=lsb-test-perl
-VERSION=5.0.1
+VERSION=5.0.2
 BUILDNO=1
 PERLVER8=5.8.8
 PERLVER10=5.10.0

=== modified file 'scripts/package/lsb-test-perl.spec.sed'
--- a/scripts/package/lsb-test-perl.spec.sed	2013-03-17 03:02:17 +0000
+++ b/scripts/package/lsb-test-perl.spec.sed	2015-02-02 23:40:42 +0000
@@ -56,6 +56,7 @@
 Patch35: perl-test-bug-3590.patch
 Patch36: perl-test-bug-3660.patch
 Patch37: perl-test-bug-3735.patch
+Patch38: perl-test-bug-3282.patch
 
 URL: http://bzr.linuxfoundation.org/loggerhead/lsb/devel/perl-test/files
 BuildRoot: %{_tmppath}/%{name}-root
@@ -95,6 +96,7 @@
 %patch33 -p0 -b .3466
 %patch36 -p0 -b .3660
 %patch37 -p0 -b .3735
+%patch38 -p1 -b .3282
 cd ..
 %patch17 -p1 -b .2845
 %patch18 -p1 -b .2848

=== added file 'scripts/package/perl-test-bug-3282.patch'
--- a/scripts/package/perl-test-bug-3282.patch	1970-01-01 00:00:00 +0000
+++ b/scripts/package/perl-test-bug-3282.patch	2015-02-02 23:40:42 +0000
@@ -0,0 +1,61 @@
+diff -Naur perl-5.10.0/lib/Locale/Codes/t/constants.t perl-5.10.0.new/lib/Locale/Codes/t/constants.t
+--- perl-5.10.0/lib/Locale/Codes/t/constants.t	2007-12-18 13:47:07.000000000 +0300
++++ perl-5.10.0.new/lib/Locale/Codes/t/constants.t	1970-01-01 03:00:00.000000000 +0300
+@@ -1,44 +0,0 @@
+-#!./perl
+-#
+-# constants.t - tests for Locale::Constants
+-#
+-
+-use Locale::Constants;
+-
+-print "1..3\n";
+-
+-if (defined LOCALE_CODE_ALPHA_2
+-    && defined LOCALE_CODE_ALPHA_3
+-    && defined LOCALE_CODE_NUMERIC)
+-{
+-    print "ok 1\n";
+-}
+-else
+-{
+-    print "not ok 1\n";
+-}
+-
+-if (LOCALE_CODE_ALPHA_2 != LOCALE_CODE_ALPHA_3
+-    && LOCALE_CODE_ALPHA_2 != LOCALE_CODE_NUMERIC
+-    && LOCALE_CODE_ALPHA_3 != LOCALE_CODE_NUMERIC)
+-{
+-    print "ok 2\n";
+-}
+-else
+-{
+-    print "not ok 2\n";
+-}
+-
+-if (defined LOCALE_CODE_DEFAULT
+-    && (LOCALE_CODE_DEFAULT == LOCALE_CODE_ALPHA_2
+-	|| LOCALE_CODE_DEFAULT == LOCALE_CODE_ALPHA_3
+-	|| LOCALE_CODE_DEFAULT == LOCALE_CODE_NUMERIC))
+-{
+-    print "ok 3\n";
+-}
+-else
+-{
+-    print "not ok 3\n";
+-}
+-
+-exit 0;
+diff -Naur perl-5.10.0/lib/Locale/Codes/t/languages.t perl-5.10.0.new/lib/Locale/Codes/t/languages.t
+--- perl-5.10.0/lib/Locale/Codes/t/languages.t	2015-02-03 00:07:39.000000000 +0400
++++ perl-5.10.0.new/lib/Locale/Codes/t/languages.t	2015-02-03 00:07:05.000000000 +0400
+@@ -48,7 +48,8 @@
+  'code2language("nn") eq "Norwegian Nynorsk"',
+  'code2language("oc") eq "Occitan (post 1500)"',
+  'code2language("pi") eq "Pali"',
+- '!defined code2language("sh")',             # Serbo-Croatian withdrawn
++# This is a valid code on modern systems
++# '!defined code2language("sh")',             # Serbo-Croatian withdrawn
+  'code2language("sc") eq "Sardinian"',
+  'code2language("kw") eq "Cornish"',
+  'code2language("gv") eq "Manx"',

=== modified file 'scripts/package/tst_perlModPresent.pl'
--- a/scripts/package/tst_perlModPresent.pl	2015-01-31 13:20:58 +0000
+++ b/scripts/package/tst_perlModPresent.pl	2015-02-02 23:40:42 +0000
@@ -147,7 +147,8 @@
     use_ok( 'IPC::Semaphore' );
     use_ok( 'IPC::SysV' );
     use_ok( 'List::Util' );
-    use_ok( 'Locale::Constants' );
+# dropped per bug 3282
+#   use_ok( 'Locale::Constants' );
     use_ok( 'Locale::Country' );
     use_ok( 'Locale::Currency' );
     use_ok( 'Locale::Language' );