From 04da95071a985bb6d5c83fd9d3febf7586be8cf694ff294ccf50b5f7916225f2 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 6 Oct 2017 18:07:37 +0000 Subject: [PATCH] Accepting request 532195 from home:fstrba:branches:Base:System Fix building of timezone-java with any java version OBS-URL: https://build.opensuse.org/request/show/532195 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=214 --- timezone-java.changes | 7 +++++++ timezone-java.spec | 4 ++-- timezone-java.spec.in | 4 ++-- timezone.changes | 7 +++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index 43a9367..58c6f52 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 6 12:20:02 UTC 2017 - fstrba@suse.com + +- Require simply java, since with the new version of javazic, it + is possible to generate the timezone information using any java + version + ------------------------------------------------------------------- Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index fda528f..f6c7853 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -18,7 +18,6 @@ Name: timezone-java BuildRequires: java -BuildConflicts: java >= 1.8 BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions @@ -39,10 +38,11 @@ Patch3: iso3166-uk.diff # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html -PreReq: filesystem, coreutils +Requires(pre): filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release} +#!BuildIgnore: tzdata-java tzdata-java8 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 56a896a..d302396 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -18,7 +18,6 @@ Name: timezone-java BuildRequires: java -BuildConflicts: java >= 1.8 BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions @@ -27,10 +26,11 @@ Group: System/Base # COMMON-BEGIN # COMMON-END Url: http://www.gnu.org/software/libc/libc.html -PreReq: filesystem, coreutils +Requires(pre): filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release} +#!BuildIgnore: tzdata-java tzdata-java8 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/timezone.changes b/timezone.changes index 43a9367..58c6f52 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 6 12:20:02 UTC 2017 - fstrba@suse.com + +- Require simply java, since with the new version of javazic, it + is possible to generate the timezone information using any java + version + ------------------------------------------------------------------- Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com