pool/timezone
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 843576 from home:AndreasStieger:branches:Base:System

Browse Source 
- Adjust timezone-java.spec.in to avoid build failures when running
  pre_checkin.sh

OBS-URL: https://build.opensuse.org/request/show/843576
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=261
This commit is contained in:
Markéta Machová 2020-10-23 11:38:48 +00:00 committed by Git OBS Bridge
parent e4d4dfe1ec
commit f5e42b8fab
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timezone-java.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
- Adjust timezone-java.spec.in to avoid build failures when running
pre_checkin.sh
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com> Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>

3
timezone-java.spec
View File

@ -40,11 +40,10 @@ Patch4: timezone-2018f-bsc1112310.patch
# COMMON-END # COMMON-END
URL: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
Requires(pre): filesystem, coreutils Requires(pre): filesystem, coreutils
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 #!BuildIgnore: tzdata-java tzdata-java8
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch
%description %description
These are configuration files that describe available time zones - this These are configuration files that describe available time zones - this

19
timezone-java.spec.in
View File

@ -1,7 +1,7 @@
# #
# spec file for package timezone-java # spec file for package timezone-java
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -21,17 +21,16 @@ BuildRequires: java
BuildRequires: javazic BuildRequires: javazic
BuildRequires: tzdb BuildRequires: tzdb
Summary: Time Zone Descriptions Summary: Time Zone Descriptions
License: BSD-3-Clause and SUSE-Public-Domain License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base Group: System/Base
# COMMON-BEGIN # COMMON-BEGIN
# COMMON-END # COMMON-END
Url: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
Requires(pre): filesystem, coreutils Requires(pre): filesystem, coreutils
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 #!BuildIgnore: tzdata-java tzdata-java8
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch
%description %description
These are configuration files that describe available time zones - this These are configuration files that describe available time zones - this
@ -50,15 +49,15 @@ echo "tzdata%{version}" >> VERSION
# Java 6/7 data # Java 6/7 data
java -jar %{_javadir}/javazic.jar -V %{version} \ java -jar %{_javadir}/javazic.jar -V %{version} \
-d javazi \ -d javazi \
africa antarctica asia australasia europe northamerica pacificnew \ africa antarctica asia australasia europe northamerica \
southamerica backward etcetera systemv \ southamerica backward etcetera \
%{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/gmt \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward %{_datadir}/javazic/tzdata_jdk/jdk11_backward
# Java 8/9 data # Java 8/9 data
java -jar %{_javadir}/tzdb.jar \ java -jar %{_javadir}/tzdb.jar \
-srcdir . -dstfile javazi/tzdb.dat \ -srcdir . -dstfile javazi/tzdb.dat \
africa antarctica asia australasia europe northamerica pacificnew \ africa antarctica asia australasia europe northamerica \
southamerica backward etcetera systemv \ southamerica backward etcetera \
%{_datadir}/tzdb/tzdata_jdk/gmt \ %{_datadir}/tzdb/tzdata_jdk/gmt \
%{_datadir}/tzdb/tzdata_jdk/jdk11_backward %{_datadir}/tzdb/tzdata_jdk/jdk11_backward

6
timezone.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
- Adjust timezone-java.spec.in to avoid build failures when running
pre_checkin.sh
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com> Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>