[perl-Net-Jabber] Patch the testuite so it won't fail with timezones which include spaces

Petr Šabata psabata at fedoraproject.org
Thu Jun 12 14:43:03 UTC 2014


commit dd238c805a80858810c7410db6c1f7b51162f7dc
Author: Petr Šabata <contyk at redhat.com>
Date:   Thu Jun 12 16:42:58 2014 +0200

    Patch the testuite so it won't fail with timezones which include spaces
    
      in their abbreviations (#1108698)

 Net-Jabber-2.0-timezone.patch |   13 +++++++++++++
 perl-Net-Jabber.spec          |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/Net-Jabber-2.0-timezone.patch b/Net-Jabber-2.0-timezone.patch
new file mode 100644
index 0000000..906008e
--- /dev/null
+++ b/Net-Jabber-2.0-timezone.patch
@@ -0,0 +1,13 @@
+diff --git a/t/query_time.t b/t/query_time.t
+index 8c4efbe..5b1a897 100644
+--- a/t/query_time.t
++++ b/t/query_time.t
+@@ -55,7 +55,7 @@ SKIP:
+     eval("use Time::Timezone 99.062401;");
+     skip "Time::Timezone not installed", 1 if $@;
+ 
+-    like( $query3->GetTZ(), qr/^\S+$/, "look like a timezone?" );
++    like( $query3->GetTZ(), qr/^\S+( \S+)?$/, "look like a timezone?" );
+ }
+ 
+ 
diff --git a/perl-Net-Jabber.spec b/perl-Net-Jabber.spec
index fa2faa4..77b45c0 100644
--- a/perl-Net-Jabber.spec
+++ b/perl-Net-Jabber.spec
@@ -1,12 +1,13 @@
 Name:           perl-Net-Jabber
-Version:        2.0 
-Release:        23%{?dist}
+Version:        2.0
+Release:        24%{?dist}
 Summary:        Net::Jabber - Jabber Perl Library
 Group:          Development/Libraries
 License:        (GPL+ or Artistic) or LGPLv2+
 URL:            http://search.cpan.org/dist/Net-Jabber/
 Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/Net-Jabber-%{version}.tar.gz 
 Source1:        LICENSING.correspondance
+Patch0:         Net-Jabber-2.0-timezone.patch
 BuildArch:      noarch
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
@@ -38,6 +39,7 @@ For more information about Jabber visit:
 
 %prep
 %setup -q -n Net-Jabber-%{version}
+%patch0 -p1
 cp %{SOURCE1} .
 # generate our other two licenses...
 perldoc perlgpl > LICENSE.GPL
@@ -71,6 +73,10 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jun 12 2014 Petr Šabata <contyk at redhat.com> - 2.0-24
+- Patch the testuite so it won't fail with timezones which include spaces
+  in their abbreviations (#1108698)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list