Hello community,
here is the log from the commit of package timezone for openSUSE:Factory
checked in at 2014-12-03 22:47:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/timezone (Old)
and /work/SRC/openSUSE:Factory/.timezone.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone"
Changes:
--------
--- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2014-11-18
22:53:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes
2014-12-03 22:47:19.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Nov 20 16:19:01 UTC 2014 - fst...@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
+
+-------------------------------------------------------------------
timezone.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ timezone-java.spec ++++++
--- /var/tmp/diff_new_pack.wKDamI/_old 2014-12-03 22:47:21.000000000 +0100
+++ /var/tmp/diff_new_pack.wKDamI/_new 2014-12-03 22:47:21.000000000 +0100
@@ -17,9 +17,9 @@
Name: timezone-java
-BuildRequires: fastjar
-BuildRequires: gcc-gij
+BuildRequires: java-bootstrap
BuildRequires: javazic
+BuildRequires: tzdb
Summary: Time Zone Descriptions
License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
@@ -46,6 +46,7 @@
PreReq: filesystem, coreutils
BuildArch: noarch
Provides: tzdata-java = %{version}-%{release}
+Provides: tzdata-java8 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -71,13 +72,23 @@
# COMMON-PREP-END
# COMMON-PREP-END
+echo "tzdata%{version}" >> VERSION
+
%build
-gij -jar %{_javadir}/javazic.jar -V %{version} \
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
-d javazi \
africa antarctica asia australasia europe northamerica pacificnew \
southamerica backward etcetera systemv \
%{_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 -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
++++++ timezone-java.spec.in ++++++
--- /var/tmp/diff_new_pack.wKDamI/_old 2014-12-03 22:47:21.000000000 +0100
+++ /var/tmp/diff_new_pack.wKDamI/_new 2014-12-03 22:47:21.000000000 +0100
@@ -17,9 +17,9 @@
Name: timezone-java
-BuildRequires: fastjar
-BuildRequires: gcc-gij
+BuildRequires: java-bootstrap
BuildRequires: javazic
+BuildRequires: tzdb
Summary: Time Zone Descriptions
License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
@@ -29,6 +29,7 @@
PreReq: filesystem, coreutils
BuildArch: noarch
Provides: tzdata-java = %{version}-%{release}
+Provides: tzdata-java8 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -42,13 +43,23 @@
# COMMON-PREP-BEGIN
# COMMON-PREP-END
+echo "tzdata%{version}" >> VERSION
+
%build
-gij -jar %{_javadir}/javazic.jar -V %{version} \
- -d javazi \
- africa antarctica asia australasia europe northamerica pacificnew \
- southamerica backward etcetera systemv \
- %{_datadir}/javazic/tzdata_jdk/gmt \
- %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
+ -d javazi \
+ africa antarctica asia australasia europe northamerica pacificnew \
+ southamerica backward etcetera systemv \
+ %{_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 -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
