#18 Fix conflicts between llvm-static = 8 and llvm-dev < 8 around LLVMStaticExports.cmake
Merged 5 years ago by sergesanspaille. Opened 5 years ago by sergesanspaille.
rpms/ sergesanspaille/llvm fix/static-exports-conflict  into  master

file modified
+5 -1
@@ -40,7 +40,7 @@ 

  

  Name:		%{pkg_name}

  Version:	%{maj_ver}.%{min_ver}.%{patch_ver}

- Release:	6%{?rc_ver:.rc%{rc_ver}}%{?dist}

+ Release:	7%{?rc_ver:.rc%{rc_ver}}%{?dist}

  Summary:	The Low Level Virtual Machine

  

  License:	NCSA
@@ -114,6 +114,7 @@ 

  

  %package static

  Summary:	LLVM static libraries

+ Conflicts:	%{name}-devel < 8

  

  %description static

  Static libraries for the LLVM compiler infrastructure.
@@ -462,6 +463,9 @@ 

  %endif

  

  %changelog

+ * Fri May 17 2019 sguelton@redhat.com - 8.0.0-7

+ - Fix conflicts between llvm-static = 8 and llvm-dev < 8 around LLVMStaticExports.cmake

+ 

  * Wed Apr 24 2019 Tom Stellard <tstellar@redhat.com> - 8.0.0-6

  - Make sure we aren't passing -g on s390x

  

no initial comment

Pull-Request has been merged by sergesanspaille

5 years ago