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
This commit is contained in:
Markéta Machová 2020-10-30 11:54:32 +00:00 committed by Git OBS Bridge
parent f5e42b8fab
commit 3428a35b6b
4 changed files with 26 additions and 1 deletions

13
fat.patch Normal file
View File

@ -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.

View File

@ -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>

View File

@ -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>

View File

@ -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