From f5e42b8fab24a1178d78827830a1f6fcf5968012b9e0f832df7636c1f403fd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Fri, 23 Oct 2020 11:38:48 +0000
Subject: [PATCH] Accepting request 843576 from
 home:AndreasStieger:branches:Base:System

- 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
---
 timezone-java.changes |  6 ++++++
 timezone-java.spec    |  3 +--
 timezone-java.spec.in | 19 +++++++++----------
 timezone.changes      |  6 ++++++
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/timezone-java.changes b/timezone-java.changes
index b4a3e30..98090d9 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -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>
 
diff --git a/timezone-java.spec b/timezone-java.spec
index d8867fc..b98c37b 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -40,11 +40,10 @@ Patch4:         timezone-2018f-bsc1112310.patch
 # COMMON-END
 URL:            https://www.iana.org/time-zones
 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
+BuildArch:      noarch
 
 %description
 These are configuration files that describe available time zones - this
diff --git a/timezone-java.spec.in b/timezone-java.spec.in
index 24127de..d640fd7 100644
--- a/timezone-java.spec.in
+++ b/timezone-java.spec.in
@@ -1,7 +1,7 @@
 #
 # 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
 # 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)
 # 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:  tzdb
 Summary:        Time Zone Descriptions
-License:        BSD-3-Clause and SUSE-Public-Domain
+License:        BSD-3-Clause AND SUSE-Public-Domain
 Group:          System/Base
 # COMMON-BEGIN
 # COMMON-END
-Url:            https://www.iana.org/time-zones
+URL:            https://www.iana.org/time-zones
 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
+BuildArch:      noarch
 
 %description
 These are configuration files that describe available time zones - this
@@ -50,15 +49,15 @@ echo "tzdata%{version}" >> VERSION
 # Java 6/7 data
 java -jar %{_javadir}/javazic.jar -V %{version} \
      -d javazi \
-     africa antarctica asia australasia europe northamerica pacificnew \
-     southamerica backward etcetera systemv  \
+     africa antarctica asia australasia europe northamerica \
+     southamerica backward etcetera  \
      %{_datadir}/javazic/tzdata_jdk/gmt \
      %{_datadir}/javazic/tzdata_jdk/jdk11_backward
 # Java 8/9 data
 java -jar %{_javadir}/tzdb.jar \
      -srcdir . -dstfile javazi/tzdb.dat \
-     africa antarctica asia australasia europe northamerica pacificnew \
-     southamerica backward etcetera systemv  \
+     africa antarctica asia australasia europe northamerica \
+     southamerica backward etcetera  \
      %{_datadir}/tzdb/tzdata_jdk/gmt \
      %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
 
diff --git a/timezone.changes b/timezone.changes
index b4a3e30..98090d9 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -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>