rpm/timezone
SHA256
1
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

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

Browse Source 
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
This commit is contained in:
Andreas Stieger 2017-10-06 18:07:37 +00:00 committed by Git OBS Bridge
parent 97bb4f3fb7
commit 04da95071a
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
timezone-java.changes
View File

@ -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 Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com

4
timezone-java.spec
View File

@ -18,7 +18,6 @@
Name: timezone-java Name: timezone-java
BuildRequires: java BuildRequires: java
BuildConflicts: java >= 1.8
BuildRequires: javazic BuildRequires: javazic
BuildRequires: tzdb BuildRequires: tzdb
Summary: Time Zone Descriptions Summary: Time Zone Descriptions
@ -39,10 +38,11 @@ Patch3: iso3166-uk.diff
# COMMON-END # COMMON-END
# COMMON-END # COMMON-END
Url: http://www.gnu.org/software/libc/libc.html Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem, coreutils Requires(pre): filesystem, coreutils
BuildArch: noarch BuildArch: noarch
Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release}
#!BuildIgnore: tzdata-java tzdata-java8
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description

4
timezone-java.spec.in
View File

@ -18,7 +18,6 @@
Name: timezone-java Name: timezone-java
BuildRequires: java BuildRequires: java
BuildConflicts: java >= 1.8
BuildRequires: javazic BuildRequires: javazic
BuildRequires: tzdb BuildRequires: tzdb
Summary: Time Zone Descriptions Summary: Time Zone Descriptions
@ -27,10 +26,11 @@ Group: System/Base
# COMMON-BEGIN # COMMON-BEGIN
# COMMON-END # COMMON-END
Url: http://www.gnu.org/software/libc/libc.html Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem, coreutils Requires(pre): filesystem, coreutils
BuildArch: noarch BuildArch: noarch
Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release}
#!BuildIgnore: tzdata-java tzdata-java8
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description

7
timezone.changes
View File

@ -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 Sat Sep 16 07:11:55 UTC 2017 - fstrba@suse.com