From 4b95769419d5d4c2db812086e45836c8b1387af1054c048db2c5bcaf50a461f2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 19 Sep 2017 08:51:28 +0000 Subject: [PATCH 1/2] Accepting request 527125 from Java:Factory 1 OBS-URL: https://build.opensuse.org/request/show/527125 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=211 --- timezone-java.changes | 6 ++++++ timezone-java.spec | 3 ++- timezone-java.spec.in | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index 7cc1bfa..43a9367 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com + +- Do not require java-bootstrap, since it does not exist any more; + use java < 1.8 instead + ------------------------------------------------------------------- Wed Mar 22 08:17:32 UTC 2017 - astieger@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index 37ea9bb..2ebb54a 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -17,7 +17,8 @@ Name: timezone-java -BuildRequires: java-bootstrap +BuildRequires: java-devel +BuildConflicts: java-devel >= 1.8 BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 5e6c4e4..56a896a 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -17,7 +17,8 @@ Name: timezone-java -BuildRequires: java-bootstrap +BuildRequires: java +BuildConflicts: java >= 1.8 BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions From 97bb4f3fb7b2cc883fe4ebcc4301b944738fc7db9c0d36290a0a682de8e6826f Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 21 Sep 2017 11:28:02 +0000 Subject: [PATCH 2/2] Accepting request 527740 from Java:Factory run pre_checkin.sh to sync all OBS-URL: https://build.opensuse.org/request/show/527740 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=212 --- timezone-java.spec | 8 ++++---- timezone.changes | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/timezone-java.spec b/timezone-java.spec index 2ebb54a..fda528f 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -17,15 +17,15 @@ Name: timezone-java -BuildRequires: java-devel -BuildConflicts: java-devel >= 1.8 +BuildRequires: java +BuildConflicts: java >= 1.8 BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions +# COMMON-BEGIN +# COMMON-BEGIN License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base -# COMMON-BEGIN -# COMMON-BEGIN Version: 2017b Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz diff --git a/timezone.changes b/timezone.changes index 7cc1bfa..43a9367 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com + +- Do not require java-bootstrap, since it does not exist any more; + use java < 1.8 instead + ------------------------------------------------------------------- Wed Mar 22 08:17:32 UTC 2017 - astieger@suse.com