add factory timezone and enable make check
This commit is contained in:
parent
d55aeb921b
commit
54c8b6b9f0
28
skip-check_web-testcase.patch
Normal file
28
skip-check_web-testcase.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From bb414b02a9474f0acf5231afb5a954bda0bab2fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: SuperSix173 <liuchao173@huawei.com>
|
||||||
|
Date: Sat, 31 Jul 2021 15:29:09 +0800
|
||||||
|
Subject: [PATCH] skip check_web testcase
|
||||||
|
|
||||||
|
check_web needs to access validator.w3.org. Therefore, make check
|
||||||
|
fails because the external network cannot be accessed.
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 files changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 1136af9..5ccad33 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -747,7 +747,7 @@ tzselect: tzselect.ksh version
|
||||||
|
|
||||||
|
check: check_character_set check_white_space check_links \
|
||||||
|
check_name_lengths check_sorted \
|
||||||
|
- check_tables check_web check_zishrink check_tzs
|
||||||
|
+ check_tables check_zishrink check_tzs
|
||||||
|
|
||||||
|
check_character_set: $(ENCHILADA)
|
||||||
|
test ! '$(UTF8_LOCALE)' || \
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
13
tzdata.spec
13
tzdata.spec
@ -1,6 +1,6 @@
|
|||||||
Name: tzdata
|
Name: tzdata
|
||||||
Version: 2021a
|
Version: 2021a
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Timezone data
|
Summary: Timezone data
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
URL: https://www.iana.org/time-zones
|
URL: https://www.iana.org/time-zones
|
||||||
@ -15,6 +15,7 @@ Patch9002: remove-ROC-timezone.patch
|
|||||||
Patch9003: rename-Macau-to-Macao.patch
|
Patch9003: rename-Macau-to-Macao.patch
|
||||||
Patch9004: remove-El_Aaiun-timezone.patch
|
Patch9004: remove-El_Aaiun-timezone.patch
|
||||||
Patch9005: remove-Israel-timezone.patch
|
Patch9005: remove-Israel-timezone.patch
|
||||||
|
Patch9006: skip-check_web-testcase.patch
|
||||||
|
|
||||||
BuildRequires: gawk glibc perl-interpreter
|
BuildRequires: gawk glibc perl-interpreter
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
@ -56,7 +57,7 @@ echo "%{name}%{version}" >> VERSION
|
|||||||
make VERSION=%{version} DATAFORM=rearguard tzdata.zi
|
make VERSION=%{version} DATAFORM=rearguard tzdata.zi
|
||||||
|
|
||||||
FILES="africa antarctica asia australasia europe northamerica southamerica
|
FILES="africa antarctica asia australasia europe northamerica southamerica
|
||||||
etcetera backward"
|
etcetera backward factory"
|
||||||
|
|
||||||
mkdir zoneinfo/{,posix,right}
|
mkdir zoneinfo/{,posix,right}
|
||||||
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
|
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
|
||||||
@ -80,6 +81,9 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
|
|||||||
-verbose \
|
-verbose \
|
||||||
$FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
|
$FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
rm -fr $RPM_BUILD_ROOT
|
rm -fr $RPM_BUILD_ROOT
|
||||||
@ -103,7 +107,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
|||||||
%{_datadir}/javazi-1.8
|
%{_datadir}/javazi-1.8
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon May 8 2021 liuchao<liuchao173@huawei.com> - 2021a-2
|
* Tue Aug 17 2021 liuchao<liuchao173@huawei.com> - 2021a-3
|
||||||
|
- add factory timezone and enbale make check
|
||||||
|
|
||||||
|
* Mon Mar 8 2021 liuchao<liuchao173@huawei.com> - 2021a-2
|
||||||
- Remove useless patches
|
- Remove useless patches
|
||||||
|
|
||||||
* Tue Jan 26 2021 liuchao<liuchao173@huawei.com> - 2021a-1
|
* Tue Jan 26 2021 liuchao<liuchao173@huawei.com> - 2021a-1
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user