From 37a418141be208b42169d160e678587f206e770c Mon Sep 17 00:00:00 2001 From: Josef Stribny Date: Thu, 17 Apr 2014 10:21:23 +0200 Subject: [PATCH] Update to 1.1.0 --- .gitignore | 1 + ....3.35-Fix-TimezoneTransitionInfo-eql.patch | 132 ------------------ rubygem-tzinfo.spec | 22 +-- sources | 2 +- 4 files changed, 15 insertions(+), 142 deletions(-) delete mode 100644 rubygem-tzinfo-0.3.35-Fix-TimezoneTransitionInfo-eql.patch diff --git a/.gitignore b/.gitignore index e293088..12ce6be 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /tzinfo-0.3.35.gem /rubygem-tzinfo-0.3.37-1.fc20.src.rpm /tzinfo-0.3.37.gem +/tzinfo-1.1.0.gem diff --git a/rubygem-tzinfo-0.3.35-Fix-TimezoneTransitionInfo-eql.patch b/rubygem-tzinfo-0.3.35-Fix-TimezoneTransitionInfo-eql.patch deleted file mode 100644 index 372645f..0000000 --- a/rubygem-tzinfo-0.3.35-Fix-TimezoneTransitionInfo-eql.patch +++ /dev/null @@ -1,132 +0,0 @@ -Index: lib/tzinfo/country_timezone.rb -=================================================================== ---- lib/tzinfo/country_timezone.rb (revision 386) -+++ lib/tzinfo/country_timezone.rb (revision 387) -@@ -1,5 +1,5 @@ - #-- --# Copyright (c) 2006-2010 Philip Ross -+# Copyright (c) 2006-2012 Philip Ross - # - # Permission is hereby granted, free of charge, to any person obtaining a copy - # of this software and associated documentation files (the "Software"), to deal -@@ -74,10 +74,9 @@ - # current CountryTimezone (has the same identifer, latitude, longitude - # and description). - def ==(ct) -- ct.respond_to?(:identifier) && ct.respond_to?(:latitude) && -- ct.respond_to?(:longitude) && ct.respond_to?(:description) && -- identifier == ct.identifier && latitude == ct.latitude && -- longitude == ct.longitude && description == ct.description -+ ct.kind_of?(CountryTimezone) && -+ identifier == ct.identifier && latitude == ct.latitude && -+ longitude == ct.longitude && description == ct.description - end - - # Returns true if and only if the given CountryTimezone is equal to the -Index: lib/tzinfo/timezone_transition_info.rb -=================================================================== ---- lib/tzinfo/timezone_transition_info.rb (revision 386) -+++ lib/tzinfo/timezone_transition_info.rb (revision 387) -@@ -1,5 +1,5 @@ - #-- --# Copyright (c) 2006-2010 Philip Ross -+# Copyright (c) 2006-2012 Philip Ross - # - # Permission is hereby granted, free of charge, to any person obtaining a copy - # of this software and associated documentation files (the "Software"), to deal -@@ -98,7 +98,7 @@ - # considered to be equal by == if offset, previous_offset and at are all - # equal. - def ==(tti) -- tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && tti.respond_to?(:at) && -+ tti.kind_of?(TimezoneTransitionInfo) && - offset == tti.offset && previous_offset == tti.previous_offset && at == tti.at - end - -@@ -109,8 +109,7 @@ - # which just requires the at times to be equal regardless of how they were - # originally specified. - def eql?(tti) -- tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && -- tti.respond_to?(:numerator_or_time) && tti.respond_to?(:denominator) && -+ tti.kind_of?(TimezoneTransitionInfo) && - offset == tti.offset && previous_offset == tti.previous_offset && - numerator_or_time == tti.numerator_or_time && denominator == tti.denominator - end -Index: lib/tzinfo/timezone_period.rb -=================================================================== ---- lib/tzinfo/timezone_period.rb (revision 386) -+++ lib/tzinfo/timezone_period.rb (revision 387) -@@ -1,5 +1,5 @@ - #-- --# Copyright (c) 2005-2010 Philip Ross -+# Copyright (c) 2005-2012 Philip Ross - # - # Permission is hereby granted, free of charge, to any person obtaining a copy - # of this software and associated documentation files (the "Software"), to deal -@@ -165,17 +165,19 @@ - # Returns true if this TimezonePeriod is equal to p. This compares the - # start_transition, end_transition and offset using ==. - def ==(p) -- p.respond_to?(:start_transition) && p.respond_to?(:end_transition) && -- p.respond_to?(:offset) && start_transition == p.start_transition && -- end_transition == p.end_transition && offset == p.offset -+ p.kind_of?(TimezonePeriod) && -+ start_transition == p.start_transition && -+ end_transition == p.end_transition && -+ offset == p.offset - end - - # Returns true if this TimezonePeriods is equal to p. This compares the - # start_transition, end_transition and offset using eql? - def eql?(p) -- p.respond_to?(:start_transition) && p.respond_to?(:end_transition) && -- p.respond_to?(:offset) && start_transition.eql?(p.start_transition) && -- end_transition.eql?(p.end_transition) && offset.eql?(p.offset) -+ p.kind_of?(TimezonePeriod) && -+ start_transition.eql?(p.start_transition) && -+ end_transition.eql?(p.end_transition) && -+ offset.eql?(p.offset) - end - - # Returns a hash of this TimezonePeriod. -Index: lib/tzinfo/time_or_datetime.rb -=================================================================== ---- lib/tzinfo/time_or_datetime.rb (revision 386) -+++ lib/tzinfo/time_or_datetime.rb (revision 387) -@@ -1,5 +1,5 @@ - #-- --# Copyright (c) 2006-2010 Philip Ross -+# Copyright (c) 2006-2012 Philip Ross - # - # Permission is hereby granted, free of charge, to any person obtaining a copy - # of this software and associated documentation files (the "Software"), to deal -@@ -251,7 +251,7 @@ - # constructed with the same type (DateTime, Time or timestamp) as this - # TimeOrDateTime. - def eql?(todt) -- todt.respond_to?(:to_orig) && to_orig.eql?(todt.to_orig) -+ todt.kind_of?(TimeOrDateTime) && to_orig.eql?(todt.to_orig) - end - - # Returns a hash of this TimeOrDateTime. -Index: lib/tzinfo/timezone_offset_info.rb -=================================================================== ---- lib/tzinfo/timezone_offset_info.rb (revision 386) -+++ lib/tzinfo/timezone_offset_info.rb (revision 387) -@@ -1,5 +1,5 @@ - #-- --# Copyright (c) 2006 Philip Ross -+# Copyright (c) 2006-2012 Philip Ross - # - # Permission is hereby granted, free of charge, to any person obtaining a copy - # of this software and associated documentation files (the "Software"), to deal -@@ -71,7 +71,7 @@ - # Returns true if and only if toi has the same utc_offset, std_offset - # and abbreviation as this TimezoneOffsetInfo. - def ==(toi) -- toi.respond_to?(:utc_offset) && toi.respond_to?(:std_offset) && toi.respond_to?(:abbreviation) && -+ toi.kind_of?(TimezoneOffsetInfo) && - utc_offset == toi.utc_offset && std_offset == toi.std_offset && abbreviation == toi.abbreviation - end - diff --git a/rubygem-tzinfo.spec b/rubygem-tzinfo.spec index 5eb9570..9190dc9 100644 --- a/rubygem-tzinfo.spec +++ b/rubygem-tzinfo.spec @@ -5,19 +5,21 @@ Summary: Daylight-savings aware timezone library Name: rubygem-%{gem_name} -Version: 0.3.37 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Group: Development/Languages License: MIT -URL: http://tzinfo.rubyforge.org/ +URL: http://tzinfo.github.io/ Source0: %{download_path}%{gem_name}-%{version}.gem Requires: ruby(release) Requires: ruby(rubygems) +Requires: rubygem(thread_safe) Requires: ruby BuildRequires: rubygems-devel BuildRequires: ruby(release) +BuildRequires: rubygem(thread_safe) BuildRequires: ruby -BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest) < 5 BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version} @@ -47,9 +49,6 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -# This was disabled for 1.9, so disable it for 2.0 as well. It appears to be -# fixed by r346 upstream, but the patch is too invasive. -sed -i "151,161 s/^/#/" test/tc_timezone.rb testrb test/ts_all.rb popd @@ -58,16 +57,21 @@ popd %doc %{gem_instdir}/LICENSE %{gem_libdir} %exclude %{gem_cache} +%exclude %{gem_instdir}/.yardopts %{gem_spec} %files doc -%doc %{gem_instdir}/CHANGES -%doc %{gem_instdir}/README +%doc %{gem_instdir}/CHANGES.md +%doc %{gem_instdir}/README.md %{gem_instdir}/Rakefile %{gem_instdir}/test +%{gem_instdir}/%{gem_name}.gemspec %{gem_docdir} %changelog +* Thu Apr 10 2014 Josef Stribny - 1.1.0-1 +- Update to tzinfo 1.1.0 + * Sun Aug 04 2013 Fedora Release Engineering - 0.3.37-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 85d9fe1..1505398 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81884148d7dc644f484fdca1bcb86d69 tzinfo-0.3.37.gem +e8ffb241f10a81eaa5e2f7c846d65238 tzinfo-1.1.0.gem