Skip to content

Commit 90f74c5

Browse files
committed
Move 'rc' to macro rc_ver
The rc_ver macro usually holds more information in order packages, e.g. alpha3, beta8, etc. While the LLVM project upstream only uses 'rc' as pre-release versions, by moving the 'rc' string to rc_ver, we make llvm compatible with package python-specfile [1] expects, making it easier for Packit to update our spec file. This also helps to remove 4 cases where 'rc' was hardcoded. [1] https://github.com/packit/specfile
1 parent 6e3d91a commit 90f74c5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

llvm.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%global maj_ver 20
44
%global min_ver 1
55
%global patch_ver 8
6-
#global rc_ver 3
6+
#global rc_ver rc3
77

88
%bcond_with snapshot_build
99
%if %{with snapshot_build}
@@ -178,7 +178,7 @@
178178
%if %{with snapshot_build}
179179
%global src_tarball_dir llvm-project-%{llvm_snapshot_git_revision}
180180
%else
181-
%global src_tarball_dir llvm-project-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}.src
181+
%global src_tarball_dir llvm-project-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-%{rc_ver}}.src
182182
%endif
183183

184184
%global has_crtobjs 1
@@ -319,7 +319,7 @@
319319
#region packages
320320
#region main package
321321
Name: %{pkg_name_llvm}
322-
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
322+
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
323323
%if 0%{?rhel} == 8
324324
Release: 1%{?dist}
325325
%else
@@ -333,8 +333,8 @@ URL: http://llvm.org
333333
%if %{with snapshot_build}
334334
Source0: https://github.com/llvm/llvm-project/archive/%{llvm_snapshot_git_revision}.tar.gz
335335
%else
336-
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz
337-
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz.sig
336+
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-%{rc_ver}}/%{src_tarball_dir}.tar.xz
337+
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-%{rc_ver}}/%{src_tarball_dir}.tar.xz.sig
338338
%endif
339339
Source6: release-keys.asc
340340

0 commit comments

Comments
 (0)