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..fda528f 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -17,14 +17,15 @@ Name: timezone-java -BuildRequires: java-bootstrap +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-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 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