From 862d9cb81b28c445bfca34b70800174cfd8dcc7b0ebff4a18f229d7b82a70052 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 25 Oct 2011 12:48:33 +0000
Subject: [PATCH] - apply patches also for timezone-java - add patch to fix
 Tiraspol split

- apply patches also for timezone-java
- add patch to fix Tiraspol split

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=62
---
 chisinau-split-fix.diff | 11 +++++++++++
 pre_checkin.sh          |  4 +++-
 timezone-java.changes   |  6 ++++++
 timezone-java.spec      | 16 ++++++++++++++++
 timezone-java.spec.in   |  2 ++
 timezone.changes        |  6 ++++++
 timezone.spec           |  6 +++++-
 7 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 chisinau-split-fix.diff

diff --git a/chisinau-split-fix.diff b/chisinau-split-fix.diff
new file mode 100644
index 0000000..b53dcf2
--- /dev/null
+++ b/chisinau-split-fix.diff
@@ -0,0 +1,11 @@
+--- a/zone.tab
++++ b/zone.tab
+@@ -257,7 +257,7 @@
+ LY	+3254+01311	Africa/Tripoli
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+-MD	+4700+02850	Europe/Chisinau
++MD	+4700+02850	Europe/Chisinau	most locations
+ MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
diff --git a/pre_checkin.sh b/pre_checkin.sh
index f8876ea..a46d091 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -6,5 +6,7 @@ ln -f timezone.changes timezone-java.changes
 for spec in timezone-java.spec; do
 { sed -n -e '1,/COMMON-BEGIN/p' $spec.in
   sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec
-  sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
+  sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in
+  sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec
+  sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
 done
diff --git a/timezone-java.changes b/timezone-java.changes
index 8bda189..b50814d 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
+
+- apply patches also for timezone-java
+- add patch to fix Tiraspol split
+
 -------------------------------------------------------------------
 Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de
 
diff --git a/timezone-java.spec b/timezone-java.spec
index 293ffce..9a142fc 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -29,6 +29,12 @@ Version:        2011m
 Release:        1
 Source:         ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
 Source1:        ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
+Patch0:         tzdata-china.diff
+Patch1:         tzcode-zic.diff
+Patch2:         tzcode-ksh.diff
+Patch3:         iso3166-uk.diff
+Patch4:         tzcode-link.diff
+Patch5:         chisinau-split-fix.diff
 # COMMON-END
 # COMMON-END
 Url:            http://www.gnu.org/software/libc/libc.html
@@ -45,6 +51,16 @@ package is intended for Java Virtual Machine based on OpenJDK.
 
 %prep
 %setup -c
+# COMMON-PREP-BEGIN
+# COMMON-PREP-BEGIN
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5 -p1
+# COMMON-PREP-END
+# COMMON-PREP-END
 
 %build
 gij -jar %{_javadir}/javazic.jar -V %{version} \
diff --git a/timezone-java.spec.in b/timezone-java.spec.in
index 4a93fb6..bb5b8bc 100644
--- a/timezone-java.spec.in
+++ b/timezone-java.spec.in
@@ -39,6 +39,8 @@ package is intended for Java Virtual Machine based on OpenJDK.
 
 %prep
 %setup -c
+# COMMON-PREP-BEGIN
+# COMMON-PREP-END
 
 %build
 gij -jar %{_javadir}/javazic.jar -V %{version} \
diff --git a/timezone.changes b/timezone.changes
index 8bda189..b50814d 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
+
+- apply patches also for timezone-java
+- add patch to fix Tiraspol split
+
 -------------------------------------------------------------------
 Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de
 
diff --git a/timezone.spec b/timezone.spec
index aeb7954..c8f211c 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -29,12 +29,13 @@ Version:        2011m
 Release:        1
 Source:         ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
 Source1:        ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
-# COMMON-END
 Patch0:         tzdata-china.diff
 Patch1:         tzcode-zic.diff
 Patch2:         tzcode-ksh.diff
 Patch3:         iso3166-uk.diff
 Patch4:         tzcode-link.diff
+Patch5:         chisinau-split-fix.diff
+# COMMON-END
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global AREA    Etc
 %global ZONE    UTC
@@ -47,11 +48,14 @@ can select an appropriate time zone for your system with YaST.
 
 %prep
 %setup -c -a 1
+# COMMON-PREP-BEGIN
 %patch0
 %patch1
 %patch2
 %patch3
 %patch4
+%patch5 -p1
+# COMMON-PREP-END
 
 %build
 unset ${!LC_*}