From 971a85191eabf6732c97933481e683017bbba302 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 3 Apr 2008 20:16:37 +0000 Subject: [PATCH 1/5] Initialize branch EL-5 for tzdata-java --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 647c4b1e9171bec66a14c3d05b20030affc1be4b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 4 Apr 2008 08:14:48 +0000 Subject: [PATCH 2/5] Initial import --- .cvsignore | 2 + sources | 2 + tzdata-java-2007k-chile.patch | 27 +++++++++++++ tzdata-java.spec | 71 +++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 tzdata-java-2007k-chile.patch create mode 100644 tzdata-java.spec diff --git a/.cvsignore b/.cvsignore index e69de29..ad45616 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +javazic.tar.gz +tzdata2007k.tar.gz diff --git a/sources b/sources index e69de29..8fe3c38 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz +595b3b197174fa0c2dd654c52969fb2a tzdata2007k.tar.gz diff --git a/tzdata-java-2007k-chile.patch b/tzdata-java-2007k-chile.patch new file mode 100644 index 0000000..6fe6884 --- /dev/null +++ b/tzdata-java-2007k-chile.patch @@ -0,0 +1,27 @@ +diff -urp tzdata-java-2007k.orig/tzdata/antarctica tzdata-java-2007k/tzdata/antarctica +--- tzdata-java-2007k.orig/tzdata/antarctica 2007-11-19 23:33:32.000000000 +0100 ++++ tzdata-java-2007k/tzdata/antarctica 2008-03-19 12:24:36.000000000 +0100 +@@ -53,7 +53,8 @@ Rule ChileAQ 1998 only - Mar Sun>=9 3:00 + Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S + Rule ChileAQ 1999 only - Apr 4 3:00u 0 - + Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S +-Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - ++Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - ++Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - + + + # Argentina - year-round bases +diff -urp tzdata-java-2007k.orig/tzdata/southamerica tzdata-java-2007k/tzdata/southamerica +--- tzdata-java-2007k.orig/tzdata/southamerica 2007-12-31 16:24:53.000000000 +0100 ++++ tzdata-java-2007k/tzdata/southamerica 2008-03-19 12:24:36.000000000 +0100 +@@ -789,7 +789,8 @@ Rule Chile 1998 only - Mar Sun>=9 3:00u + Rule Chile 1998 only - Sep 27 4:00u 1:00 S + Rule Chile 1999 only - Apr 4 3:00u 0 - + Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S +-Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - ++Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - ++Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - + # IATA SSIM anomalies: (1992-02) says 1992-03-14; + # (1996-09) says 1998-03-08. Ignore these. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +Only in tzdata-java-2007k/tzdata: southamerica.orig diff --git a/tzdata-java.spec b/tzdata-java.spec new file mode 100644 index 0000000..3cc987c --- /dev/null +++ b/tzdata-java.spec @@ -0,0 +1,71 @@ +Name: tzdata-java +Version: 2007k +Release: 0.1%{?dist} +# To make sure the release is smaller than one of tzdata +# so that it has precedence, increment only the seocond digit +Summary: Time zone data for Java language + +Group: System Environment/Base +License: Public Domain +# The compiler is GPLv2 +URL: ftp://elsie.nci.nih.gov/pub/ +Source0: javazic.tar.gz +Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz +Patch0: tzdata-java-2007k-chile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1.5 +BuildArch: noarch + +%description +Compiled time zone data files for use with Java +programming language. + +%prep +# Unpack compiler files +%setup -q -c +# Unpack tzdata into subdirectory +%setup -q -D -T -b 1 -c -n %{name}-%{version}/tzdata +# Just reset the build directory name +%setup -q -D -T + +%patch0 -p1 -b .chile + +# Replace 'sun' with 'rht' so that namespaces won't clash +mv sun rht +find . -name "*.java" | +while read F +do + sed -r 's,sun\.(tools|util),rht.\1,g' -i $F +done + +%build +# Build compiler +find rht -name "*.java" |xargs javac -source 1.5 -target 1.5 + +# Build zone files +mkdir javazi +java -classpath . rht.tools.javazic.Main -d javazi \ + tzdata_jdk/gmt tzdata_jdk/jdk11_backward \ + $(find tzdata |egrep '^tzdata/[a-z0-9]*$' |grep -v factory) +# The grep above filters out non-zone files and one that won't compile + + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir} +cp -a javazi $RPM_BUILD_ROOT%{_datadir} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_datadir}/javazi + + +%changelog +* Wed Mar 19 2008 Lubomir Kundrak - 2007k-0.1 +- Initial packaging attempt for Fedora EPEL From 73359c475bc525cadcc6c8e753c3bb62b545c1a3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 5 Apr 2008 21:55:52 +0000 Subject: [PATCH 3/5] file bootstrap-tzdata-java.spec was initially added on branch tzdata-java-2007k-0_1_el5_BOOTSTRAP. From a7e8c32d0f82f198963052bfe89b37bda3353bdb Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 6 Apr 2008 15:20:36 +0000 Subject: [PATCH 4/5] - Temporarily build arch-dependent, so we can omit ppc --- tzdata-java.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tzdata-java.spec b/tzdata-java.spec index 3cc987c..9b1def7 100644 --- a/tzdata-java.spec +++ b/tzdata-java.spec @@ -1,6 +1,6 @@ Name: tzdata-java Version: 2007k -Release: 0.1%{?dist} +Release: 0.2%{?dist} # To make sure the release is smaller than one of tzdata # so that it has precedence, increment only the seocond digit Summary: Time zone data for Java language @@ -15,7 +15,9 @@ Patch0: tzdata-java-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5 -BuildArch: noarch +#BuildArch: noarch +ExcludeArch: ppc + %description Compiled time zone data files for use with Java @@ -67,5 +69,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 06 2008 Lubomir Kundrak - 2007k-0.2 +- Temporarily build arch-dependent, so we can omit ppc + * Wed Mar 19 2008 Lubomir Kundrak - 2007k-0.1 - Initial packaging attempt for Fedora EPEL From cf6e134f6dcb88483a22ec0559708d89e585e4e4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 14 Apr 2008 19:57:17 +0000 Subject: [PATCH 5/5] - Build noarch, also for ppc this time --- tzdata-java.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tzdata-java.spec b/tzdata-java.spec index 9b1def7..caa89b3 100644 --- a/tzdata-java.spec +++ b/tzdata-java.spec @@ -1,6 +1,6 @@ Name: tzdata-java Version: 2007k -Release: 0.2%{?dist} +Release: 0.3%{?dist} # To make sure the release is smaller than one of tzdata # so that it has precedence, increment only the seocond digit Summary: Time zone data for Java language @@ -15,8 +15,7 @@ Patch0: tzdata-java-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5 -#BuildArch: noarch -ExcludeArch: ppc +BuildArch: noarch %description @@ -69,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 14 2008 Lubomir Kundrak - 2007k-0.3 +- Build noarch, also for ppc this time + * Sun Apr 06 2008 Lubomir Kundrak - 2007k-0.2 - Temporarily build arch-dependent, so we can omit ppc