Rename clang-16 to clang16 and llvm-16 to llvm16 (#5300)

* rename to clang16 and llvm16

* Revert "Add an explicit constraint on llvm-devel < 16.0.0 for bcc, ldd & mesa (#5278)"

This reverts commit 7fd75c9287.

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -2589,7 +2589,7 @@
                 "chrpath",
                 "cifs-utils",
                 "clang",
-                "clang-16",
+                "clang16",
                 "cloud-init",
                 "cloud-utils-growpart",
                 "cmake",
@@ -2791,7 +2791,7 @@
                 "lldb",
                 "lldpad",
                 "llvm",
-                "llvm-16",
+                "llvm16",
                 "lm-sensors",
                 "lmdb",
                 "log4cpp",

SPECS/bcc/bcc.spec

@@ -2,7 +2,7 @@
 Summary:        BPF Compiler Collection (BCC)
 Name:           bcc
 Version:        0.24.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -17,7 +17,7 @@ BuildRequires:  elfutils-libelf-devel
 BuildRequires:  flex
 BuildRequires:  gcc
 BuildRequires:  libstdc++
-BuildRequires:  llvm-devel < 16.0.0
+BuildRequires:  llvm-devel
 BuildRequires:  make
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
@@ -121,9 +121,6 @@ find %{buildroot}%{_lib64dir} -name '*.a' -delete
 %{_datadir}/%{name}/man/*
 
 %changelog
-* Tue Apr 11 2023 Muhammad Falak R Wani <mwani@microsoft.com> - 0.24.0-2
-- Add an explicit constraint on llvm-devel < 16.0.0
-
 * Wed Feb 09 2022 Chris Co <chrco@microsoft.com> - 0.24.0-1
 - Update to 0.24.0
 

SPECS/clang/clang16.spec

@@ -30,10 +30,10 @@
     %{_bindir}/scan-build-py
 
 %global clang_srcdir llvm-project-llvmorg-%{version}
-%global clang_tools_srcdir %{name}-tools-extra-%{version}.src
+%global clang_tools_srcdir clang-tools-extra-%{version}.src
 
 Summary:        C, C++, Objective C and Objective C++ front-end for the LLVM compiler.
-Name:           clang
+Name:           clang16
 Version:        %{maj_ver}.%{min_ver}.%{patch_ver}
 Release:        1%{?dist}
 License:        NCSA
@@ -45,14 +45,14 @@ Source0:        https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-%
 Source1:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_tools_srcdir}.tar.xz
 BuildRequires:  cmake
 BuildRequires:  libxml2-devel
-BuildRequires:  llvm-devel = %{version}
+BuildRequires:  llvm16-devel = %{version}
 BuildRequires:  ncurses-devel
 BuildRequires:  python3-devel
 BuildRequires:  zlib-devel
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       libstdc++-devel
 Requires:       libxml2
-Requires:       llvm
+Requires:       llvm16
 Requires:       ncurses
 Requires:       python3
 Requires:       zlib
@@ -225,7 +225,7 @@ make clang-check
 
 %changelog
 * Wed Apr 05 2023 Andrew Phelps <anphel@microsoft.com> - 16.0.0-1
-- Add spec for clang-16
+- Add spec for clang16
 
 * Fri Oct 07 2022 Andy Caldwell <andycaldwell@microsoft.com> - 12.0.1-4
 - Enable `-pie` executables by default

SPECS/lld/lld.spec

@@ -1,7 +1,7 @@
 Summary:        LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them
 Name:           lld
 Version:        12.0.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        NCSA
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -15,7 +15,7 @@ Source1:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%
 BuildRequires:  build-essential
 BuildRequires:  cmake
 BuildRequires:  file
-BuildRequires:  llvm-devel < 16.0.0
+BuildRequires:  llvm-devel
 BuildRequires:  ninja-build
 BuildRequires:  python3
 Requires:       %{name}-libs = %{version}-%{release}
@@ -71,9 +71,6 @@ cd build
 %{_libdir}/*.so.12*
 
 %changelog
-*   Tue Apr 11 2023 Muhammad Falak R Wani <mwani@microsoft.com> - 12.0.1-2
--   Add an explicit constraint on llvm-devel < 16.0.0
-
 *   Thu Aug 12 2021 Andy Caldwell <andycaldwell@microsoft.com>  12.0.1-1
 -   Original version for CBL-Mariner.
 -   License verified

SPECS/llvm/llvm16.spec

@@ -1,5 +1,5 @@
 Summary:        A collection of modular and reusable compiler and toolchain technologies.
-Name:           llvm
+Name:           llvm16
 Version:        16.0.0
 Release:        1%{?dist}
 License:        NCSA
@@ -15,7 +15,7 @@ BuildRequires:  ninja-build
 BuildRequires:  python3-devel
 Requires:       libxml2
 Provides:       %{name} = %{version}
-Provides:       llvm = %{version}-%{release}
+Provides:       %{name} = %{version}-%{release}
 
 %description
 The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them. The name "LLVM" itself is not an acronym; it is the full name of the project.
@@ -29,7 +29,7 @@ The llvm-devel package contains libraries, header files and documentation
 for developing applications that use llvm.
 
 %prep
-%setup -q -n %{name}-project-llvmorg-%{version}
+%setup -q -n llvm-project-llvmorg-%{version}
 
 %build
 # Disable symbol generation
@@ -89,7 +89,7 @@ ninja check-all
 
 %changelog
 * Wed Apr 05 2023 Andrew Phelps <anphel@microsoft.com> - 16.0.0-1
-- Add spec for llvm-16
+- Add spec for llvm16
 
 * Tue Dec 06 2022 Adam Schwab <adschwab@microsoft.com> - 12.0.1-5
 - Workaround for llvm issue #49955 with patch

SPECS/mesa/mesa.spec

@@ -52,7 +52,7 @@
 Summary:        Mesa graphics libraries
 Name:           mesa
 Version:        21.0.0
-Release:        4%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -73,7 +73,7 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gcc
 BuildRequires:  gettext
-BuildRequires:  llvm-devel < 16.0.0
+BuildRequires:  llvm-devel >= 7.0.0
 BuildRequires:  meson >= 0.45
 BuildRequires:  pkgconfig(dri2proto) >= 2.8
 BuildRequires:  pkgconfig(expat)
@@ -588,9 +588,6 @@ popd
 %endif
 
 %changelog
-* Tue Apr 11 2023 Muhammad Falak R Wani <mwani@microsoft.com> - 21.0.0-4
-- Add an explicit constraint on llvm-devel < 16.0.0
-
 * Wed Oct 27 2021 Muhammad Falak <mwani@microsft.com> - 21.0.0-3
 - Remove epoch
 

cgmanifest.json

@@ -1746,7 +1746,7 @@
       "component": {
         "type": "other",
         "other": {
-          "name": "clang",
+          "name": "clang16",
           "version": "16.0.0",
           "downloadUrl": "https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-16.0.0.tar.gz"
         }
@@ -12150,7 +12150,7 @@
       "component": {
         "type": "other",
         "other": {
-          "name": "llvm",
+          "name": "llvm16",
           "version": "16.0.0",
           "downloadUrl": "https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-16.0.0.tar.gz"
         }