From dd20346232aad7aad054d152e4edc3b377c370f5551cb199a5dca0ddff7a3ec9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 4 Nov 2009 10:02:50 +0000 Subject: [PATCH 1/3] Accepting request 23797 from home:coolo:branches:openSUSE:Factory:branched Copy from home:coolo:branches:openSUSE:Factory:branched/timezone via accept of submit request 23797 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/23797 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=11 --- timezone.changes | 5 +++++ tzdata-china.diff | 28 +++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/timezone.changes b/timezone.changes index a313247..f17e1c8 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Oct 26 17:20:13 CET 2009 - pbaudis@suse.cz diff --git a/tzdata-china.diff b/tzdata-china.diff index 3afa07d..7d77155 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,6 +1,8 @@ ---- asia -+++ asia 2006/04/24 09:56:17 -@@ -240,6 +240,9 @@ +Index: asia +=================================================================== +--- asia.orig ++++ asia +@@ -351,6 +351,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o 5:00 - KAST 1980 May 8:00 PRC C%sT @@ -10,9 +12,11 @@ # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule HK 1946 only - Apr 20 3:30 1:00 S ---- backward -+++ backward 2006/04/24 09:56:17 -@@ -78,12 +78,11 @@ +Index: backward +=================================================================== +--- backward.orig ++++ backward +@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -26,11 +30,13 @@ Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey ---- zone.tab -+++ zone.tab 2006/04/24 09:56:17 -@@ -135,11 +135,12 @@ +Index: zone.tab +=================================================================== +--- zone.tab.orig ++++ zone.tab +@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations - CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez + CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin @@ -45,4 +51,4 @@ +CN +3929+07559 Asia/Kashgar China west Xinjiang CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica - CS +4450+02030 Europe/Belgrade + CU +2308-08222 America/Havana From ccd2367552567cb709c793ffa3bb711cb961070956c5927a4c724ff24e6c0332 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 10:45:36 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=12 --- timezone.changes | 5 ----- tzdata-china.diff | 28 +++++++++++----------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/timezone.changes b/timezone.changes index f17e1c8..a313247 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Mon Oct 26 17:20:13 CET 2009 - pbaudis@suse.cz diff --git a/tzdata-china.diff b/tzdata-china.diff index 7d77155..3afa07d 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,8 +1,6 @@ -Index: asia -=================================================================== ---- asia.orig -+++ asia -@@ -351,6 +351,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +--- asia ++++ asia 2006/04/24 09:56:17 +@@ -240,6 +240,9 @@ 5:00 - KAST 1980 May 8:00 PRC C%sT @@ -12,11 +10,9 @@ Index: asia # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule HK 1946 only - Apr 20 3:30 1:00 S -Index: backward -=================================================================== ---- backward.orig -+++ backward -@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General +--- backward ++++ backward 2006/04/24 09:56:17 +@@ -78,12 +78,11 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -30,13 +26,11 @@ Index: backward Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey -Index: zone.tab -=================================================================== ---- zone.tab.orig -+++ zone.tab -@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga +--- zone.tab ++++ zone.tab 2006/04/24 09:56:17 +@@ -135,11 +135,12 @@ CL -3327-07040 America/Santiago most locations - CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez + CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin @@ -51,4 +45,4 @@ Index: zone.tab +CN +3929+07559 Asia/Kashgar China west Xinjiang CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica - CU +2308-08222 America/Havana + CS +4450+02030 Europe/Belgrade From 1cb0af0b2bed77a1f621a6b625d3faf432d0fa0e160f975731ded6abec0eaed5 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 16 Nov 2009 10:45:37 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/timezone revision 25.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=63d68f36b187fd5c6dd65788513ab455 --- timezone-java.changes | 5 +++++ timezone-java.spec | 2 +- timezone.changes | 5 +++++ timezone.spec | 2 +- tzdata-china.diff | 28 +++++++++++++++++----------- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index a313247..f17e1c8 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Oct 26 17:20:13 CET 2009 - pbaudis@suse.cz diff --git a/timezone-java.spec b/timezone-java.spec index 568d832..3f33f38 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -26,7 +26,7 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN Version: 2009p -Release: 1 +Release: 2 Source: tzdata%{version}.tar.gz Source1: tzcode2009k.tar.gz # COMMON-END diff --git a/timezone.changes b/timezone.changes index a313247..f17e1c8 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Oct 26 17:20:13 CET 2009 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index a85b04c..8284660 100644 --- a/timezone.spec +++ b/timezone.spec @@ -26,7 +26,7 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN Version: 2009p -Release: 1 +Release: 2 Source: tzdata%{version}.tar.gz Source1: tzcode2009k.tar.gz # COMMON-END diff --git a/tzdata-china.diff b/tzdata-china.diff index 3afa07d..7d77155 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,6 +1,8 @@ ---- asia -+++ asia 2006/04/24 09:56:17 -@@ -240,6 +240,9 @@ +Index: asia +=================================================================== +--- asia.orig ++++ asia +@@ -351,6 +351,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o 5:00 - KAST 1980 May 8:00 PRC C%sT @@ -10,9 +12,11 @@ # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule HK 1946 only - Apr 20 3:30 1:00 S ---- backward -+++ backward 2006/04/24 09:56:17 -@@ -78,12 +78,11 @@ +Index: backward +=================================================================== +--- backward.orig ++++ backward +@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -26,11 +30,13 @@ Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey ---- zone.tab -+++ zone.tab 2006/04/24 09:56:17 -@@ -135,11 +135,12 @@ +Index: zone.tab +=================================================================== +--- zone.tab.orig ++++ zone.tab +@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations - CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez + CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin @@ -45,4 +51,4 @@ +CN +3929+07559 Asia/Kashgar China west Xinjiang CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica - CS +4450+02030 Europe/Belgrade + CU +2308-08222 America/Havana