From cf284c4e87ddf22cef7d5775b877d622eb749953 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Mar 2023 07:42:02 +0100 Subject: [PATCH 1/2] Unconditionally include 0003-continue-to-ship-posixrules.patch This makes it possible to create a RHEL-compatible source RPM on non-RHEL distributions. The patch is still included/skipped at build time due to the remaining conditionals. --- tzdata.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 50f1830..25a5f04 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -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 Patch002: 0002-Fix-have-snprintf-error.patch -%if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch -%endif BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter From ed5061e02f9e7ca4878bfe955326a7f0e3003b50 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Mar 2023 11:37:04 +0100 Subject: [PATCH 2/2] Drop %{eln} conditions ELN defines %{rhel}, so these conditions are redundant. --- tzdata.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 25a5f04..82e4194 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -42,7 +42,7 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 %patch002 -p1 -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} %patch003 -p1 %endif @@ -55,7 +55,7 @@ pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz popd -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} # Use rearguard for rhel (overwrite default vangaurd data) tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif @@ -88,7 +88,7 @@ echo "%{name}%{tzdata_version}" >> VERSION %build # Run make to create the tzdata.zi file rm tzdata.zi -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} make VERSION=%{version} DATAFORM=rearguard tzdata.zi %else make tzdata.zi