Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d738fc4997 | ||
|
|
2517a795f1 | ||
| b4c25afea2 | |||
| cf6e134f6d | |||
| a7e8c32d0f | |||
| 73359c475b | |||
| 647c4b1e91 | |||
| 971a85191e |
7 changed files with 110 additions and 21 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
javazic.tar.gz
|
||||
tzdata2007k.tar.gz
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: tzdata-java
|
||||
# $Id$
|
||||
NAME := tzdata-java
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
tzdata since RHEL 5.2 has a subpackage that provides this
|
||||
2
sources
2
sources
|
|
@ -0,0 +1,2 @@
|
|||
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
|
||||
595b3b197174fa0c2dd654c52969fb2a tzdata2007k.tar.gz
|
||||
27
tzdata-java-2007k-chile.patch
Normal file
27
tzdata-java-2007k-chile.patch
Normal file
|
|
@ -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
|
||||
78
tzdata-java.spec
Normal file
78
tzdata-java.spec
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
Name: tzdata-java
|
||||
Version: 2007k
|
||||
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
|
||||
|
||||
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
|
||||
* Mon Apr 14 2008 Lubomir Kundrak <lkundrak@redhat.com> - 2007k-0.3
|
||||
- Build noarch, also for ppc this time
|
||||
|
||||
* Sun Apr 06 2008 Lubomir Kundrak <lkundrak@redhat.com> - 2007k-0.2
|
||||
- Temporarily build arch-dependent, so we can omit ppc
|
||||
|
||||
* Wed Mar 19 2008 Lubomir Kundrak <lkundrak@redhat.com> - 2007k-0.1
|
||||
- Initial packaging attempt for Fedora EPEL
|
||||
Loading…
Add table
Add a link
Reference in a new issue