rpms/tzdata
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge #13 Clean up RHEL conditions

Browse Source
This commit is contained in:
Patsy Franklin 2023-03-07 19:59:59 +00:00
commit 3501676c96
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tzdata.spec
View File

@ -10,9 +10,7 @@ Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
Patch002: 0002-Fix-have-snprintf-error.patch Patch002: 0002-Fix-have-snprintf-error.patch
%if 0%{?rhel} || 0%{?eln}
Patch003: 0003-continue-to-ship-posixrules.patch Patch003: 0003-continue-to-ship-posixrules.patch
%endif
BuildRequires: make BuildRequires: make
BuildRequires: gawk, glibc, perl-interpreter BuildRequires: gawk, glibc, perl-interpreter
@ -44,7 +42,7 @@ This package contains timezone information for use by Java runtimes.
%setup -q -c -a 1 %setup -q -c -a 1
%patch002 -p1 %patch002 -p1
%if 0%{?rhel} || 0%{?eln} %if 0%{?rhel}
%patch003 -p1 %patch003 -p1
%endif %endif
@ -57,7 +55,7 @@ pushd rearguard
tar zxf tzdata%{version}-rearguard.tar.gz tar zxf tzdata%{version}-rearguard.tar.gz
popd popd
%if 0%{?rhel} || 0%{?eln} %if 0%{?rhel}
# Use rearguard for rhel (overwrite default vangaurd data) # Use rearguard for rhel (overwrite default vangaurd data)
tar zxf rearguard/tzdata%{version}-rearguard.tar.gz tar zxf rearguard/tzdata%{version}-rearguard.tar.gz
%endif %endif
@ -90,7 +88,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
%build %build
# Run make to create the tzdata.zi file # Run make to create the tzdata.zi file
rm tzdata.zi rm tzdata.zi
%if 0%{?rhel} || 0%{?eln} %if 0%{?rhel}
make VERSION=%{version} DATAFORM=rearguard tzdata.zi make VERSION=%{version} DATAFORM=rearguard tzdata.zi
%else %else
make tzdata.zi make tzdata.zi