pool/timezone
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 262805 from home:fstrba:branches:Base:System

Browse Source 
Add to timezone-java Java8 compatible database

OBS-URL: https://build.opensuse.org/request/show/262805
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=149
This commit is contained in:
Dirk Mueller 2014-11-24 10:10:38 +00:00 committed by Git OBS Bridge
parent f9e8dd7934
commit 2dcbec409a
4 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
timezone-java.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 20 16:19:01 UTC 2014 - fstrba@suse.com
- make timezone-java compatible with Java8
* Add generation of tzdb.dat used by Java8 and Java9
* Require tzdb package to be able to generate this database
* Build using java-bootstrap 1.7 used in openSUSE:Factory to
bootstrap java-1_7_0-openjdk
* Add virtual provider tzdata-java8 in order to be able to
require it for java-1_8_0-openjdk
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de

27
timezone-java.spec
View File

@ -17,9 +17,9 @@
Name: timezone-java Name: timezone-java
BuildRequires: fastjar BuildRequires: java-bootstrap
BuildRequires: gcc-gij
BuildRequires: javazic BuildRequires: javazic
BuildRequires: tzdb
Summary: Time Zone Descriptions Summary: Time Zone Descriptions
License: BSD-3-Clause and SUSE-Public-Domain License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base Group: System/Base
@ -46,6 +46,7 @@ Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem, coreutils PreReq: filesystem, coreutils
BuildArch: noarch BuildArch: noarch
Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -71,13 +72,23 @@ sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
# COMMON-PREP-END # COMMON-PREP-END
# COMMON-PREP-END # COMMON-PREP-END
echo "tzdata%{version}" >> VERSION
%build %build
gij -jar %{_javadir}/javazic.jar -V %{version} \ # Java 6/7 data
-d javazi \ java -jar %{_javadir}/javazic.jar -V %{version} \
africa antarctica asia australasia europe northamerica pacificnew \ -d javazi \
southamerica backward etcetera systemv \ africa antarctica asia australasia europe northamerica pacificnew \
%{_datadir}/javazic/tzdata_jdk/gmt \ southamerica backward etcetera systemv \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward %{_datadir}/javazic/tzdata_jdk/gmt \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward
# Java 8/9 data
java -jar %{_javadir}/tzdb.jar \
-srcdir . -dstfile javazi/tzdb.dat \
africa antarctica asia australasia europe northamerica pacificnew \
southamerica backward etcetera systemv \
%{_datadir}/tzdb/tzdata_jdk/gmt \
%{_datadir}/tzdb/tzdata_jdk/jdk11_backward
%install %install
install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}

27
timezone-java.spec.in
View File

@ -17,9 +17,9 @@
Name: timezone-java Name: timezone-java
BuildRequires: fastjar BuildRequires: java-bootstrap
BuildRequires: gcc-gij
BuildRequires: javazic BuildRequires: javazic
BuildRequires: tzdb
Summary: Time Zone Descriptions Summary: Time Zone Descriptions
License: BSD-3-Clause and SUSE-Public-Domain License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base Group: System/Base
@ -29,6 +29,7 @@ Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem, coreutils PreReq: filesystem, coreutils
BuildArch: noarch BuildArch: noarch
Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -42,13 +43,23 @@ package is intended for Java Virtual Machine based on OpenJDK.
# COMMON-PREP-BEGIN # COMMON-PREP-BEGIN
# COMMON-PREP-END # COMMON-PREP-END
echo "tzdata%{version}" >> VERSION
%build %build
gij -jar %{_javadir}/javazic.jar -V %{version} \ # Java 6/7 data
-d javazi \ java -jar %{_javadir}/javazic.jar -V %{version} \
africa antarctica asia australasia europe northamerica pacificnew \ -d javazi \
southamerica backward etcetera systemv \ africa antarctica asia australasia europe northamerica pacificnew \
%{_datadir}/javazic/tzdata_jdk/gmt \ southamerica backward etcetera systemv \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward %{_datadir}/javazic/tzdata_jdk/gmt \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward
# Java 8/9 data
java -jar %{_javadir}/tzdb.jar \
-srcdir . -dstfile javazi/tzdb.dat \
africa antarctica asia australasia europe northamerica pacificnew \
southamerica backward etcetera systemv \
%{_datadir}/tzdb/tzdata_jdk/gmt \
%{_datadir}/tzdb/tzdata_jdk/jdk11_backward
%install %install
install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}

11
timezone.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 20 16:19:01 UTC 2014 - fstrba@suse.com
- make timezone-java compatible with Java8
* Add generation of tzdb.dat used by Java8 and Java9
* Require tzdb package to be able to generate this database
* Build using java-bootstrap 1.7 used in openSUSE:Factory to
bootstrap java-1_7_0-openjdk
* Add virtual provider tzdata-java8 in order to be able to
require it for java-1_8_0-openjdk
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de Tue Nov 11 18:36:37 UTC 2014 - andreas.stieger@gmx.de