From 6fede73eba6fc0a783c36d2e33d11b18d26e88c9 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Oct 19 2011 13:29:37 +0000
Subject: Merge branch 'f15' into f16


---

diff --git a/tzdata-2011j-ukraine.patch b/tzdata-2011j-ukraine.patch
new file mode 100644
index 0000000..626f56a
--- /dev/null
+++ b/tzdata-2011j-ukraine.patch
@@ -0,0 +1,76 @@
+commit 4182c08d1b5d3bc82e834f645abef670d1776659
+Author: tz <tz@elsie.nci.nih.gov>
+Date:   Mon Sep 26 21:30:36 2011 +0200
+diff --git a/europe b/europe
+index baed8fe..a2ec972 100644
+--- tzdata2011l/europe
++++ tzdata2011l/europe
+@@ -2613,28 +2630,6 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+ 
+-# From Alexander Krivenyshev (2011-09-20):
+-# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+-# abolish the transfer clock to winter time.
+-#
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+-# approval from 266 deputies.
+-#
+-# Ukraine abolishes transter back to the winter time (in Russian)
+-# <a href="http://news.mail.ru/politics/6861560/">
+-# http://news.mail.ru/politics/6861560/
+-# </a>
+-#
+-# The Ukrainians will no longer change the clock (in Russian)
+-# <a href="http://www.segodnya.ua/news/14290482.html">
+-# http://www.segodnya.ua/news/14290482.html
+-# </a>
+-#
+-# Deputies cancelled the winter time (in Russian)
+-# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
+-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+-# </a>
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Most of Ukraine since 1970 has been like Kiev.
+ # "Kyiv" is the transliteration of the Ukrainian name, but
+@@ -2626,8 +2665,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
+ 			3:00	-	MSK	1990 Jul  1 2:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Ruthenia used CET 1990/1991.
+ # "Uzhhorod" is the transliteration of the Ukrainian name, but
+ # "Uzhgorod" is more common in English.
+@@ -2640,8 +2680,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
+ 			1:00	-	CET	1991 Mar 31 3:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+ # "Zaporizhia" is the transliteration of the Ukrainian name, but
+ # "Zaporozh'ye" is more common in English.  Use the common English
+@@ -2653,8 +2694,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
+ 			1:00	C-Eur	CE%sT	1943 Oct 25
+ 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Central Crimea used Moscow time 1994/1997.
+ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
+@@ -2678,8 +2720,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ # Assume it happened in March by not changing the clocks.
+ 			3:00	Russia	MSK/MSD	1997
+ 			3:00	-	MSK	1997 Mar lastSun 1:00u
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ 
+ ###############################################################################
+ 
diff --git a/tzdata.spec b/tzdata.spec
index 805123c..3cc4f50 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011l
 %define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011l-kemerovo.patch
 Patch2: tzdata-2011l-brazil.patch
+Patch3: tzdata-2011j-ukraine.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 19 2011 Petr Machata <pmachata@redhat.com> - 2011l-3
+- Ukraine will enter Winter Time after all
+
 * Fri Oct 14 2011 Petr Machata <pmachata@redhat.com> - 2011l-2
 - State of Bahia, Brazil, to resume Summer Time on Oct 16
 - The project moved, reflect this in URL