#114 Fix Source0 and Source1 because %{version} contained the rc_ver twice
Closed a year ago by kkleine. Opened a year ago by kkleine.
rpms/ kkleine/llvm f35  into  f35

file modified
+7 -6
@@ -53,13 +53,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}
@@ -260,10 +260,7 @@ 

  	-DLLVM_BUILD_DOCS:BOOL=ON \

  	-DLLVM_ENABLE_SPHINX:BOOL=ON \

  	-DLLVM_ENABLE_DOXYGEN:BOOL=OFF \

- 	\

- %if %{without compat_build}

  	-DLLVM_VERSION_SUFFIX='' \

- %endif

  	-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \

  	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \

  	-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \
@@ -469,6 +466,7 @@ 

  %{_libdir}/%{name}/lib/LLVMgold.so

  %endif

  %{pkg_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so

+ %{pkg_libdir}/libLLVM-%{maj_ver}.so.%{abi_revision}

  %{pkg_libdir}/libLTO.so*

  %exclude %{pkg_libdir}/libLTO.so

  %endif
@@ -530,6 +528,9 @@ 

  %endif

  

  %changelog

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

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

+ 

  * Wed Aug 04 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0~rc1-1

  - 13.0.0-rc1 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-13.0.0~rc1-rc1/llvm-13.0.0rc1.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0~rc1-rc1/llvm-13.0.0rc1.src.tar.xz.sig

The correct URLs would be

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

rebased onto e87cd5bdfbc7112f310be2377d55ff06ceb32b9d

a year ago

rebased onto 41a6cfba88c1a3208d8aec22cdc38ab2f5848477

a year ago

rebased onto b599ebf

a year ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

rebased onto 7bfce64

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

LGTM, but I'm not sure we need to bump the release number for such changes

1 new commit added

  • Try to fix problem with git.so suffix
a year ago

2 new commits added

  • Try to fix problem with git.so suffix
  • Fix Source0/1: %{version} had rc_ver twice
a year ago

1 new commit added

  • Add lib with abi version that was missing for compat-packages
a year ago

1 new commit added

  • Revert "Add lib with abi version that was missing for compat-packages"
a year ago

3 new commits added

  • Add lib with abi version that was missing for compat-packages
  • Try to fix problem with git.so suffix
  • Fix Source0/1: %{version} had rc_ver twice
a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Pull-Request has been closed by kkleine

a year ago
Metadata