Fix executable symlink

https://bugzilla.redhat.com/show_bug.cgi?id=2316833

.gitignore

@@ -2,3 +2,7 @@
 /clang-tools-extra-18.1.7.src.tar.xz.sig
 /clang-tools-extra-18.1.7.src.tar.xz
 /clang-18.1.7.src.tar.xz
+/clang-18.1.8.src.tar.xz.sig
+/clang-tools-extra-18.1.8.src.tar.xz.sig
+/clang-tools-extra-18.1.8.src.tar.xz
+/clang-18.1.8.src.tar.xz

clang18.spec

@@ -23,7 +23,7 @@
 
 %global maj_ver 18
 %global min_ver 1
-%global patch_ver 7
+%global patch_ver 8
 #global rc_ver 4
 
 %if %{with snapshot_build}
@@ -123,6 +123,7 @@ BuildRequires:	ninja-build
 
 %if %{with compat_build}
 %global llvm_pkg_name llvm%{maj_ver}
+Conflicts: clang < %{lua: return tonumber(macros['maj_ver']) + 1}
 %else
 %global llvm_pkg_name llvm
 BuildRequires:  %{llvm_pkg_name}-test = %{version}
@@ -183,10 +184,6 @@ BuildRequires: perl(Sys::Hostname)
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
-%if %{with compat_build}
-Conflicts: clang = %{maj_ver}
-%endif
-
 # clang requires gcc, clang++ requires libstdc++-devel
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1021645
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1158594
@@ -221,9 +218,6 @@ Recommends: libatomic%{?_isa}
 # with -fopenmp.
 Recommends: libomp%{sub_pkg_suffix}-devel%{_isa} = %{version}
 Recommends: libomp%{sub_pkg_suffix}%{_isa} = %{version}
-%if %{with compat_build}
-Conflicts: clang-libs = %{maj_ver}
-%endif
 
 %description libs
 Runtime library for clang.
@@ -505,7 +499,7 @@ for f in %{buildroot}/%{install_bindir}/*; do
 done
 
 # Add clang++-{version} symlink
-ln -s ../../%{install_bindir}/clang++  %{buildroot}%{install_bindir}/clang++-%{maj_ver}
+ln -s clang++ %{buildroot}%{install_bindir}/clang++-%{maj_ver}
 
 %endif
 
@@ -737,6 +731,16 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake
 
 %endif
 %changelog
+* Mon Oct 07 2024 Timm Bäder <tbaeder@redhat.com> - 18.1.8-5
+- Fix clang++-18 symlink location
+- https://bugzilla.redhat.com/show_bug.cgi?id=2316833
+
+* Fri Oct 04 2024 Timm Bäder <tbaeder@redhat.com> - 18.1.8-4
+- Update to 18.1.8
+
+* Fri Sep 27 2024 Timm Bäder <tbaeder@redhat.com> - 18.1.7-6
+- Add conflicts with next major version of non-compat package
+
 * Mon Jun 10 2024 Tom Stellard <tstellar@redhat.com> - 18.1.7-1
 - 18.1.7 Release
 

sources

@@ -1,4 +1,4 @@
-SHA512 (clang-18.1.7.src.tar.xz.sig) = 1794207f8a4bb0e34c782d9a93172cb3e035590d468c8c7aa782b3802adc060f2de63075bfcd38516b915c06fe1c1733d84ba0b07a88447a0f0119dc8f23f961
+SHA512 (clang-18.1.8.src.tar.xz.sig) = ff8a12108d47a97c05d0a0cd4b4af278cc0f84601970a1560e4005f256b3304c6c5129bd67c8f5a387596b8bdd54ddda5066d9db7e9ecb4bcb0bfcd57d319c49
-SHA512 (clang-tools-extra-18.1.7.src.tar.xz.sig) = 511c54c41b2bec0c2c52277aa984fe6e201c9781125a968acdc6de741934a57820c0a1b5ded253e9dfae562e45d2b681d5dadf26b8f37ffe7c7b1c189feae269
+SHA512 (clang-tools-extra-18.1.8.src.tar.xz.sig) = 7730d2e34c1f65863cd1ba7d88c12e7997f645742be6c7271f5216876724837a450ff41d6225274266e4dace8c687c1af37d7115578829bf797c5724448bb174
-SHA512 (clang-tools-extra-18.1.7.src.tar.xz) = 4085dd6bf5fd6b8ea59b0c8de8b12ce3398d4e5d0c493bbc5e03acdd8fc1b4128cf04446d2b78822aee6a15f2ef689ad462d75f6e50c9a772efd0c9caf24e12e
+SHA512 (clang-tools-extra-18.1.8.src.tar.xz) = e6770875b1bfb3626de2e15133aa819669c889574134b7c22d30882717d0f400a73d2e0e881a2bd707e0b07bca5fcfd1d4a9e83b1101c7f15e4657782659b6fe
-SHA512 (clang-18.1.7.src.tar.xz) = 5f014ede7d66e45dbb74ae867fb5e90efc67a0fd4bf594c37770466d5b1d6bc5783a8e62132bbec79fbd0860c2ce790cc2b142861750cc11ff0606a97fc33a35
+SHA512 (clang-18.1.8.src.tar.xz) = 4147ef5e3547e80fbea573a6e3964870b38e7a547e796deb8859ca670b039ddd1af289cd4feadcb4ab5e94211b2ab5e91dfa84f58f114fdcbc9e807c9de901ca