From 55548760a921531d0f7e7b3de7b8eae790487c22 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Fri, 14 Apr 2023 00:30:51 -0700 Subject: [PATCH] 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 7fd75c9287f64158a4233ffd8517da288335556d. --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 4 ++-- SPECS/bcc/bcc.spec | 7 ++----- ...lang-16.signatures.json => clang16.signatures.json} | 0 SPECS/clang/{clang-16.spec => clang16.spec} | 10 +++++----- SPECS/lld/lld.spec | 7 ++----- ...{llvm-16.signatures.json => llvm16.signatures.json} | 0 SPECS/llvm/{llvm-16.spec => llvm16.spec} | 8 ++++---- SPECS/mesa/mesa.spec | 7 ++----- cgmanifest.json | 4 ++-- 10 files changed, 20 insertions(+), 29 deletions(-) rename SPECS/clang/{clang-16.signatures.json => clang16.signatures.json} (100%) rename SPECS/clang/{clang-16.spec => clang16.spec} (97%) rename SPECS/llvm/{llvm-16.signatures.json => llvm16.signatures.json} (100%) rename SPECS/llvm/{llvm-16.spec => llvm16.spec} (97%) diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 01a6123514..cc3b2923e3 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -15,6 +15,6 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | OpenEuler | [BSD-3 License](https://github.com/pytorch/pytorch/blob/master/LICENSE) | pytorch | | OpenMamba | [Openmamba GPLv2 License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt) | bash-completion | | OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-junit
antlr
aopalliance
apache-commons-beanutils
apache-commons-cli
apache-commons-codec
apache-commons-collections
apache-commons-collections4
apache-commons-compress
apache-commons-daemon
apache-commons-dbcp
apache-commons-digester
apache-commons-httpclient
apache-commons-io
apache-commons-jexl
apache-commons-lang
apache-commons-lang3
apache-commons-logging
apache-commons-net
apache-commons-pool
apache-commons-pool2
apache-commons-validator
apache-commons-vfs2
apache-parent
args4j
atinject
base64coder
bazel-workspaces
bcel
bea-stax
beust-jcommander
bsf
byaccj
cal10n
cdparanoia
cglib
cni
containerized-data-importer
cpulimit
cri-o
ecj
fillup
flux
gd
geronimo-specs
glassfish-annotation-api
glassfish-servlet-api
gnu-getopt
gnu-regexp
golang-packaging
guava
guava20
hamcrest
hawtjni-runtime
httpcomponents-core
influx-cli
influxdb
isorelax
jakarta-taglibs-standard
jansi
jarjar
java-cup
java-cup-bootstrap
javacc
javacc-bootstrap
javassist
jboss-interceptors-1.2-api
jdepend
jflex
jflex-bootstrap
jlex
jline
jna
jsch
jsoup
jsr-305
jtidy
junit
junitperf
jzlib
kubevirt
kured
libcontainers-common
libtheora
libva
libvdpau
lynx
maven-parent
multus
objectweb-anttask
objectweb-asm
objenesis
oro
osgi-annotation
osgi-compendium
osgi-core
patterns-ceph-containers
plexus-classworlds
plexus-interpolation
plexus-pom
plexus-utils
psl-make-dafsa
publicsuffix
qdox
regexp
relaxngDatatype
rhino
ripgrep
rook
servletapi4
servletapi5
slf4j
trilead-ssh2
xalan-j2
xbean
xcursor-themes
xerces-j2
xml-commons-apis
xml-commons-resolver
xmldb-api
xmlrpc-c
xmlunit
xpp2
xpp3
xz-java | -| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
clang-16
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd-3.5.0
etcd-3.5.1
etcd-3.5.3
etcd-3.5.4
etcd-3.5.5
etcd-3.5.6
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
glide
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.17
golang-1.18
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-azure
kernel-hci
kernel-headers
kernel-mshv
kernel-rt
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
llvm-16
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mozjs
mpfr
msft-golang
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-pyvmomi
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | +| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
clang16
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd-3.5.0
etcd-3.5.1
etcd-3.5.3
etcd-3.5.4
etcd-3.5.5
etcd-3.5.6
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
glide
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.17
golang-1.18
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-azure
kernel-hci
kernel-headers
kernel-mshv
kernel-rt
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
llvm16
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mozjs
mpfr
msft-golang
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-pyvmomi
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | | Rancher | [ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | k3s
k3s-1.24.6
k3s-1.25.5 | | Sysbench source | [GPLv2+ License](https://github.com/akopytov/sysbench/blob/master/COPYING) | sysbench | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index b5b049522f..5f083458cd 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/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", diff --git a/SPECS/bcc/bcc.spec b/SPECS/bcc/bcc.spec index 9fc3e6f5fb..f40d351b99 100644 --- a/SPECS/bcc/bcc.spec +++ b/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 - 0.24.0-2 -- Add an explicit constraint on llvm-devel < 16.0.0 - * Wed Feb 09 2022 Chris Co - 0.24.0-1 - Update to 0.24.0 diff --git a/SPECS/clang/clang-16.signatures.json b/SPECS/clang/clang16.signatures.json similarity index 100% rename from SPECS/clang/clang-16.signatures.json rename to SPECS/clang/clang16.signatures.json diff --git a/SPECS/clang/clang-16.spec b/SPECS/clang/clang16.spec similarity index 97% rename from SPECS/clang/clang-16.spec rename to SPECS/clang/clang16.spec index 4e6b475055..f60d8d90f3 100644 --- a/SPECS/clang/clang-16.spec +++ b/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 - 16.0.0-1 -- Add spec for clang-16 +- Add spec for clang16 * Fri Oct 07 2022 Andy Caldwell - 12.0.1-4 - Enable `-pie` executables by default diff --git a/SPECS/lld/lld.spec b/SPECS/lld/lld.spec index d4836fd707..0e0668aee9 100644 --- a/SPECS/lld/lld.spec +++ b/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 - 12.0.1-2 -- Add an explicit constraint on llvm-devel < 16.0.0 - * Thu Aug 12 2021 Andy Caldwell 12.0.1-1 - Original version for CBL-Mariner. - License verified diff --git a/SPECS/llvm/llvm-16.signatures.json b/SPECS/llvm/llvm16.signatures.json similarity index 100% rename from SPECS/llvm/llvm-16.signatures.json rename to SPECS/llvm/llvm16.signatures.json diff --git a/SPECS/llvm/llvm-16.spec b/SPECS/llvm/llvm16.spec similarity index 97% rename from SPECS/llvm/llvm-16.spec rename to SPECS/llvm/llvm16.spec index 0e93f0e885..6225610bd6 100644 --- a/SPECS/llvm/llvm-16.spec +++ b/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 - 16.0.0-1 -- Add spec for llvm-16 +- Add spec for llvm16 * Tue Dec 06 2022 Adam Schwab - 12.0.1-5 - Workaround for llvm issue #49955 with patch diff --git a/SPECS/mesa/mesa.spec b/SPECS/mesa/mesa.spec index 05aa0e4210..900599ec6a 100644 --- a/SPECS/mesa/mesa.spec +++ b/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 - 21.0.0-4 -- Add an explicit constraint on llvm-devel < 16.0.0 - * Wed Oct 27 2021 Muhammad Falak - 21.0.0-3 - Remove epoch diff --git a/cgmanifest.json b/cgmanifest.json index 043fcf28f4..d4c958bc96 100644 --- a/cgmanifest.json +++ b/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" }