[perl-Locale-SubCountry] 1.51 bump

Petr Pisar ppisar at fedoraproject.org
Tue Jul 3 11:20:11 UTC 2012


commit beeb8264b8738b64c186c4c58263db4bcb602eb4
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Jul 3 13:19:49 2012 +0200

    1.51 bump

 .gitignore                                         |    1 +
 ...ubCountry-1.51-Fix-subcountry-data-syntax.patch |   59 ++++++++++++++++++++
 perl-Locale-SubCountry.spec                        |   10 +++-
 sources                                            |    2 +-
 4 files changed, 69 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 10429d5..aba794b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 Locale-SubCountry-1.41.tar.gz
 /Locale-SubCountry-1.47.tar.gz
 /Locale-SubCountry-1.50.tar.gz
+/Locale-SubCountry-1.51.tar.gz
diff --git a/Locale-SubCountry-1.51-Fix-subcountry-data-syntax.patch b/Locale-SubCountry-1.51-Fix-subcountry-data-syntax.patch
new file mode 100644
index 0000000..c47ed26
--- /dev/null
+++ b/Locale-SubCountry-1.51-Fix-subcountry-data-syntax.patch
@@ -0,0 +1,59 @@
+From c9c8170e527bb4e74618b01efd7b066229701e22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 3 Jul 2012 13:11:10 +0200
+Subject: [PATCH] Fix subcountry data syntax
+
+<https://rt.cpan.org/Public/Bug/Display.html?id=78157>
+---
+ lib/Locale/SubCountry.pm      |    5 ++---
+ lib/Locale/SubCountry/Data.pm |    6 +++---
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Locale/SubCountry.pm b/lib/Locale/SubCountry.pm
+index 8d86bd8..567a8a7 100644
+--- a/lib/Locale/SubCountry.pm
++++ b/lib/Locale/SubCountry.pm
+@@ -480,9 +480,8 @@ our $VERSION = '1.51';
+                         }
+                         else
+                         {
+-                            print "Badly formed sub country data in $country_name\n";
+-                            print $current_line,"\n";
+-                            die;
++                            die "Badly formed sub country data in ",
++                                "$country_name: $current_line\n";
+                         }
+                     }
+                 }
+diff --git a/lib/Locale/SubCountry/Data.pm b/lib/Locale/SubCountry/Data.pm
+index ba6caba..dd8c8ed 100644
+--- a/lib/Locale/SubCountry/Data.pm
++++ b/lib/Locale/SubCountry/Data.pm
+@@ -23266,7 +23266,7 @@ q{
+     <FIPS>F3</FIPS>
+   </subcountry>
+   <subcountry>
+-    <name>Aračinovo</name 
++    <name>Aračinovo</name> 
+     <code>2</code>
+     <FIPS>01</FIPS>
+   </subcountry>
+@@ -23416,7 +23416,7 @@ q{
+     <FIPS>40</FIPS>
+   </subcountry>
+   <subcountry>
+-    <name>Karpoš/name>
++    <name>Karpoš</name>
+     <code>38</code>
+     <FIPS>41</FIPS>
+   </subcountry>
+@@ -24175,4 +24175,4 @@ q{
+ 
+ };
+ #-------------------------------------------------------------------------------
+-1;
+\ No newline at end of file
++1;
+-- 
+1.7.7.6
+
diff --git a/perl-Locale-SubCountry.spec b/perl-Locale-SubCountry.spec
index a2bb2de..e78deac 100644
--- a/perl-Locale-SubCountry.spec
+++ b/perl-Locale-SubCountry.spec
@@ -1,11 +1,13 @@
 Name:           perl-Locale-SubCountry
-Version:        1.50
-Release:        2%{?dist}
+Version:        1.51
+Release:        1%{?dist}
 Summary:        ISO 3166-2 two letter subcountry codes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Locale-SubCountry
 Source0:        http://search.cpan.org/CPAN/authors/id/K/KI/KIMRYAN/Locale-SubCountry-%{version}.tar.gz
+# Fix syntax, CPAN RT #78157
+Patch0:         Locale-SubCountry-1.51-Fix-subcountry-data-syntax.patch
 BuildArch:      noarch 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # Run-time
@@ -30,6 +32,7 @@ Canada and counties in the UK and Ireland.
 
 %prep
 %setup -q -n Locale-SubCountry-%{version}
+%patch0 -p1
 find examples -type f -exec chmod -c -x {} +
 for i in Changes lib/Locale/SubCountry.pm; do
     iconv --from=ISO-8859-1 --to=UTF-8 $i > new
@@ -57,6 +60,9 @@ make test
 
 
 %changelog
+* Tue Jul 03 2012 Petr Pisar <ppisar at redhat.com> - 1.51-1
+- 1.51 bump
+
 * Wed Jun 13 2012 Petr Pisar <ppisar at redhat.com> - 1.50-2
 - Perl 5.16 rebuild
 
diff --git a/sources b/sources
index 84ae75f..4d4d04c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e87636027a7e6fd1cc57ebbf080c0518  Locale-SubCountry-1.50.tar.gz
+0fb7c9769ab9c85e7b75b52b5ac5a8b3  Locale-SubCountry-1.51.tar.gz


More information about the scm-commits mailing list