#124 Fix Source0/1: %{version} had rc_ver twice
Merged 10 months ago by sergesanspaille. Opened 10 months ago by kkleine.
rpms/ kkleine/llvm f34  into  f34

file modified
+6 -3
@@ -48,13 +48,13 @@ 

  

  Name:		%{pkg_name}

  Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}

- Release:	1%{?dist}

+ Release:	2%{?dist}

  Summary:	The Low Level Virtual Machine

  

  License:	NCSA

  URL:		http://llvm.org

- Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz

- Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig

+ Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz

+ Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig

  Source2:	tstellar-gpg-key.asc

  

  %if %{without compat_build}
@@ -498,6 +498,9 @@ 

  %endif

  

  %changelog

+ * Wed Sep 29 2021 Konrad Kleine <kkleine@redhat.com> - 12.0.1-2

+ - Fix Source0 and Source1 because %{version} contained the rc_ver twice

+ 

  * Mon Jul 26 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-1

  - 12.0.1 Release

  

Version:        %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz
Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig

This produces a non existing URLs:

https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0~rc1-rc1/llvm-12.0.0rc1.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0~rc1-rc1/llvm-12.0.0rc1.src.tar.xz.sig

The correct URLs would be

https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc1/llvm-12.0.0rc1.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc1/llvm-12.0.0rc1.src.tar.xz.sig

Build succeeded.

Pull-Request has been merged by sergesanspaille

10 months ago
Metadata