[oe-commits] Roman I Khimov : tzdata: fix wrt recent time zone changes in Russia

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9a4c2265c1feb294c472fefc2a55c23f659fcfe8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9a4c2265c1feb294c472fefc2a55c23f659fcfe8

Author: Roman I Khimov <khimov at altell.ru>
Date:   Fri Mar 26 13:58:53 2010 +0300

tzdata: fix wrt recent time zone changes in Russia

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574919
for details.

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/tzdata/tzdata/russia-2010.diff |   32 ++++++++++++++++++++++++++++++++
 recipes/tzdata/tzdata_2010b.bb         |    5 +++--
 recipes/tzdata/tzdata_2010f.bb         |    5 +++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/recipes/tzdata/tzdata/russia-2010.diff b/recipes/tzdata/tzdata/russia-2010.diff
new file mode 100644
index 0000000..4616bad
--- /dev/null
+++ b/recipes/tzdata/tzdata/russia-2010.diff
@@ -0,0 +1,32 @@
+--- a/europe
++++ b/europe
+@@ -2041,7 +2041,8 @@
+ 			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
+ 			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
+ 			 3:00	-	KUYT	1991 Oct 20 3:00
+-			 4:00	Russia	SAM%sT	# Samara Time
++			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s
++			 3:00	Russia	SAM%sT	# Samara Time
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+ # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
+@@ -2194,7 +2195,8 @@
+ 			11:00	-	PETT	1930 Jun 21 # P-K Time
+ 			12:00	Russia	PET%sT	1991 Mar 31 2:00s
+ 			11:00	Russia	PET%sT	1992 Jan 19 2:00s
+-			12:00	Russia	PET%sT
++                        12:00   Russia  PET%sT  2010 Mar 28 2:00s
++                        11:00   Russia  PET%sT
+ #
+ # Chukotskij avtonomnyj okrug
+ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+@@ -2202,7 +2204,8 @@
+ 			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
+ 			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
+ 			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
+-			12:00	Russia	ANA%sT
++                        12:00   Russia  ANA%sT  2010 Mar 28 2:00s
++                        11:00   Russia  ANA%sT
+ 
+ # Serbia
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/recipes/tzdata/tzdata_2010b.bb b/recipes/tzdata/tzdata_2010b.bb
index 2d406bd..9bfdfba 100644
--- a/recipes/tzdata/tzdata_2010b.bb
+++ b/recipes/tzdata/tzdata_2010b.bb
@@ -1,4 +1,5 @@
 require tzdata.inc
 
-SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz"
-PR = "${INC_PR}.0"
+SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz \
+	file://russia-2010.diff;patch=1"
+PR = "${INC_PR}.1"
diff --git a/recipes/tzdata/tzdata_2010f.bb b/recipes/tzdata/tzdata_2010f.bb
index f7cf72d..d5c3409 100644
--- a/recipes/tzdata/tzdata_2010f.bb
+++ b/recipes/tzdata/tzdata_2010f.bb
@@ -1,6 +1,7 @@
 require tzdata.inc
 
-SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz;name=tar"
+SRC_URI = "http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata${PV}.tar.gz;name=tar \
+	file://russia-2010.diff;patch=1"
 SRC_URI[tar.md5sum] = "4a0e2a3594210fafc5c55b5247018618"
 SRC_URI[tar.sha256sum] = "823361e38da3f79a34c0adb835b1b6d2ae640937e3f7a7f4a2181500eeff0e94"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
\ No newline at end of file