From 3428a35b6b6dc92eb7c324fdb70259ac0aab471f639120f20b263efe88b39646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Fri, 30 Oct 2020 11:54:32 +0000
Subject: [PATCH] Accepting request 845017 from
 home:mcalabkova:branches:Base:System

- Add fat.patch to generate "fat" timezone files (was default before 2020b).

- Add fat.patch to generate "fat" timezone files (was default before 2020b).

OBS-URL: https://build.opensuse.org/request/show/845017
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=262
---
 fat.patch             | 13 +++++++++++++
 timezone-java.changes |  5 +++++
 timezone.changes      |  5 +++++
 timezone.spec         |  4 +++-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 fat.patch

diff --git a/fat.patch b/fat.patch
new file mode 100644
index 0000000..f9309e6
--- /dev/null
+++ b/fat.patch
@@ -0,0 +1,13 @@
+Index: timezone-2020d/Makefile
+===================================================================
+--- timezone-2020d.orig/Makefile
++++ timezone-2020d/Makefile
+@@ -386,7 +386,7 @@ ZIC=		$(zic) $(ZFLAGS)
+ # To grow the files and work around older application bugs, append "-b fat";
+ # see ZIC_BLOAT_DEFAULT above.
+ # See the zic man page for more about -b and -r.
+-ZFLAGS=
++ZFLAGS=-b fat
+ 
+ # How to use zic to install TZif files.
+ 
diff --git a/timezone-java.changes b/timezone-java.changes
index 98090d9..3e71237 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 30 11:43:21 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Add fat.patch to generate "fat" timezone files (was default before 2020b).
+
 -------------------------------------------------------------------
 Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/timezone.changes b/timezone.changes
index 98090d9..3e71237 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 30 11:43:21 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Add fat.patch to generate "fat" timezone files (was default before 2020b).
+
 -------------------------------------------------------------------
 Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/timezone.spec b/timezone.spec
index 1c0aa02..ddfa629 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -33,6 +33,7 @@ Source5:        %{name}.changes
 Patch0:         tzdata-china.diff
 Patch3:         iso3166-uk.diff
 Patch4:         timezone-2018f-bsc1112310.patch
+Patch5:         fat.patch
 # COMMON-END
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -51,6 +52,7 @@ can select an appropriate time zone for your system with YaST.
 %patch0 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
 # COMMON-PREP-END
 
@@ -66,7 +68,7 @@ export AREA LANG LC_ALL ZONE
 make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk BUGEMAIL="opensuse-support@opensuse.org"
 make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones
 # Generate posixrules
-./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
+./zic -b fat -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
 
 %install
 mkdir -p %{buildroot}%{_prefix}/share/zoneinfo