From 4831e159acdc668a7888e1202f2e5b1442c11b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Fri, 2 Sep 2016 09:48:55 +0200
Subject: 2.01 bump
---
.gitignore | 1 +
Locale-SubCountry-2.00-Convert-to-UTF-8.patch | 56 ---------------------------
Locale-SubCountry-2.01-Convert-to-UTF-8.patch | 56 +++++++++++++++++++++++++++
perl-Locale-SubCountry.spec | 12 ++++--
sources | 2 +-
5 files changed, 66 insertions(+), 61 deletions(-)
delete mode 100644 Locale-SubCountry-2.00-Convert-to-UTF-8.patch
create mode 100644 Locale-SubCountry-2.01-Convert-to-UTF-8.patch
diff --git a/.gitignore b/.gitignore
index aae804a..27c0254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ Locale-SubCountry-1.41.tar.gz
/Locale-SubCountry-1.65.tar.gz
/Locale-SubCountry-1.66.tar.gz
/Locale-SubCountry-2.00.tar.gz
+/Locale-SubCountry-2.01.tar.gz
diff --git a/Locale-SubCountry-2.00-Convert-to-UTF-8.patch
b/Locale-SubCountry-2.00-Convert-to-UTF-8.patch
deleted file mode 100644
index aac5a8e..0000000
--- a/Locale-SubCountry-2.00-Convert-to-UTF-8.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 500cece2be6e780f6763229843275e5c50b101c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
-Date: Mon, 25 Jul 2016 12:14:56 +0200
-Subject: [PATCH] Convert to UTF-8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- Changes | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Changes b/Changes
-index c1fbee1..1b1cd16 100644
---- a/Changes
-+++ b/Changes
-@@ -14,7 +14,7 @@ Revision history for Perl CPAN module Locale::SubCountry
- Improved documentation
- Updated France, all regions reorganised in January 2016
- Updated Italy, all regions reorganised in January 2015
-- Distrito Federal renamed to Ciudad de M�xico, in Mexico
-+ Distrito Federal renamed to Ciudad de México, in Mexico
-
-
- 1.65 25 Apr 2016
-@@ -93,7 +93,7 @@ Revision history for Perl CPAN module Locale::SubCountry
-
- 1.49 18 Apr 2012
- Fixed errors in XML coding
-- Fixed the Brazilian state Rond�nia, fix for RT bug 73830
-+ Fixed the Brazilian state Rondônia, fix for RT bug 73830
- Added 3 new Indonesian provinces, fix for RT bug 74763
- Added 'use utf8' to Data.pm, fix for RT bug 73829
- Added Metro Manila in Philippines, fixed some other provinces, fix for RT bug 69678
-@@ -102,7 +102,7 @@ Revision history for Perl CPAN module Locale::SubCountry
- Added South Sudan as a new country
- Removed states from Sudan
- Added New Caledonia, Palau, San Marino, Guernsey, Jersey, Saint Martin,
-- Saint Barth�lemy, Sint Maarten, Isle Of Man
-+ Saint Barthélemy, Sint Maarten, Isle Of Man
-
- 1.47 29 Apr 2011
- Converted tests to use Test::Simple in main.t
-@@ -188,7 +188,7 @@ Revision history for Perl CPAN module Locale::SubCountry
- Nauru
- Seychelles
-
-- For Cape Verde, changed Calheta de S�o Miguel to S�o Miguel
-+ For Cape Verde, changed Calheta de São Miguel to São Miguel
- For Venezuela, changed Distrito Federal to Distrito Capital
- Added districts for Honduras
-
---
-2.5.5
-
diff --git a/Locale-SubCountry-2.01-Convert-to-UTF-8.patch
b/Locale-SubCountry-2.01-Convert-to-UTF-8.patch
new file mode 100644
index 0000000..7e97183
--- /dev/null
+++ b/Locale-SubCountry-2.01-Convert-to-UTF-8.patch
@@ -0,0 +1,56 @@
+From 395519b0cd0e16f3c40af571a1557f1e5d95b553 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Mon, 25 Jul 2016 12:14:56 +0200
+Subject: [PATCH] Convert to UTF-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Changes | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Changes b/Changes
+index 90ce59a..4b9c927 100644
+--- a/Changes
++++ b/Changes
+@@ -20,7 +20,7 @@ Revision history for Perl CPAN module Locale::SubCountry
+ Improved documentation
+ Updated France, all regions reorganised in January 2016
+ Updated Italy, all regions reorganised in January 2015
+- Distrito Federal renamed to Ciudad de M�xico, in Mexico
++ Distrito Federal renamed to Ciudad de México, in Mexico
+
+
+ 1.65 25 Apr 2016
+@@ -99,7 +99,7 @@ Revision history for Perl CPAN module Locale::SubCountry
+
+ 1.49 18 Apr 2012
+ Fixed errors in XML coding
+- Fixed the Brazilian state Rond�nia, fix for RT bug 73830
++ Fixed the Brazilian state Rondônia, fix for RT bug 73830
+ Added 3 new Indonesian provinces, fix for RT bug 74763
+ Added 'use utf8' to Data.pm, fix for RT bug 73829
+ Added Metro Manila in Philippines, fixed some other provinces, fix for RT bug 69678
+@@ -108,7 +108,7 @@ Revision history for Perl CPAN module Locale::SubCountry
+ Added South Sudan as a new country
+ Removed states from Sudan
+ Added New Caledonia, Palau, San Marino, Guernsey, Jersey, Saint Martin,
+- Saint Barth�lemy, Sint Maarten, Isle Of Man
++ Saint Barthélemy, Sint Maarten, Isle Of Man
+
+ 1.47 29 Apr 2011
+ Converted tests to use Test::Simple in main.t
+@@ -194,7 +194,7 @@ Revision history for Perl CPAN module Locale::SubCountry
+ Nauru
+ Seychelles
+
+- For Cape Verde, changed Calheta de S�o Miguel to S�o Miguel
++ For Cape Verde, changed Calheta de São Miguel to São Miguel
+ For Venezuela, changed Distrito Federal to Distrito Capital
+ Added districts for Honduras
+
+--
+2.5.5
+
diff --git a/perl-Locale-SubCountry.spec b/perl-Locale-SubCountry.spec
index 79a58ea..9add6e9 100644
--- a/perl-Locale-SubCountry.spec
+++ b/perl-Locale-SubCountry.spec
@@ -1,5 +1,5 @@
Name: perl-Locale-SubCountry
-Version: 2.00
+Version: 2.01
Release: 1%{?dist}
Summary: ISO 3166-2 two letter subcountry codes
Group: Development/Libraries
@@ -7,7 +7,7 @@ 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-%{v...
# Normalize Changes encoding
-Patch0: Locale-SubCountry-2.00-Convert-to-UTF-8.patch
+Patch0: Locale-SubCountry-2.01-Convert-to-UTF-8.patch
BuildArch: noarch
BuildRequires: findutils
BuildRequires: make
@@ -16,7 +16,7 @@ BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
# Run-time
BuildRequires: perl(Exporter)
-BuildRequires: perl(JSON)
+BuildRequires: perl(JSON) >= 1
BuildRequires: perl(locale) >= 1
BuildRequires: perl(strict)
BuildRequires: perl(utf8)
@@ -24,10 +24,11 @@ BuildRequires: perl(warnings)
# Tests
BuildRequires: perl(Test::More) >= 0.94
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo
$version))
+Requires: perl(JSON) >= 1
Requires: perl(locale) >= 1
# Filter under-sepcified dependencies
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(locale\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\((JSON|locale)\\)$
%description
This module allows you to convert the full name for a countries administrative
@@ -62,6 +63,9 @@ make test
%changelog
+* Fri Sep 02 2016 Petr Pisar <ppisar(a)redhat.com> - 2.01-1
+- 2.01 bump
+
* Fri Aug 12 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 2.00-1
- 2.00 bump
diff --git a/sources b/sources
index 88b7914..d4b7e45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7c68418d50a524ac93839bf67a1eb80 Locale-SubCountry-2.00.tar.gz
+f44b5cc09b831c944f5afc4bb27755f8 Locale-SubCountry-2.01.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Locale-SubCountry.git/commit/?h=f...