[tzdata/f14: 1/2] Fix typo and rebase the kemerovo patch
Petr Machata
pmachata at fedoraproject.org
Mon Jun 27 14:52:21 UTC 2011
commit c8135b0084216e89054ced0834ae9e998742c4c1
Author: Petr Machata <pmachata at redhat.com>
Date: Mon Jun 27 16:51:21 2011 +0200
Fix typo and rebase the kemerovo patch
tzdata-2011g-kemerovo.patch | 14 --------------
tzdata-2011h-kemerovo.patch | 16 ++++++++++++++++
tzdata.spec | 6 +++---
3 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011h-kemerovo.patch
new file mode 100644
index 0000000..ff6da57
--- /dev/null
+++ b/tzdata-2011h-kemerovo.patch
@@ -0,0 +1,16 @@
+diff -up tzdata2011h/europe\~ tzdata2011h/europe
+--- tzdata2011h/europe~ 2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011h/europe 2011-06-27 16:49:39.323493224 +0200
+@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk 5:48:48 - NMT 19
+ 7:00 Russia KRA%sT 1991 Mar 31 2:00s
+ 6:00 Russia KRA%sT 1992 Jan 19 2:00s
+ 7:00 Russia KRA%sT 2010 Mar 28 2:00s
+- 6:00 Russia NOV%sT 2011 Mar 27 2:00s
+- 7:00 - NOVT # Novosibirsk/Novokuznetsk Time
++ 6:00 Russia OMS%sT 2011 Mar 27 2:00s
++ 7:00 - OMST # Novosibirsk/Novokuznetsk Time
+
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished. Mon Jun 27 16:49:45 2011
diff --git a/tzdata.spec b/tzdata.spec
index f05dd88..f386913 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
Summary: Timezone data
Name: tzdata
Version: 2011h
-%define tzdata_version 2011g
-%define tzcode_version 2011h
+%define tzdata_version 2011h
+%define tzcode_version 2011g
Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
# __decl_patches
-Patch1: tzdata-2011g-kemerovo.patch
+Patch1: tzdata-2011h-kemerovo.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
More information about the scm-commits
mailing list