sync from upstream

This commit is contained in:
Louis Abel 2024-06-28 09:59:00 -07:00
parent 7c863e5971
commit 668ea019fa
Signed by: label
GPG Key ID: 2A6975660E424560
2 changed files with 22 additions and 44 deletions

View File

@ -274,10 +274,6 @@
"avahi": [ "avahi": [
"avahi-glib.aarch64" "avahi-glib.aarch64"
], ],
"babel": [
"babel.noarch",
"python3-babel.noarch"
],
"babeltrace": [ "babeltrace": [
"libbabeltrace.aarch64" "libbabeltrace.aarch64"
], ],
@ -7687,10 +7683,6 @@
"avahi": [ "avahi": [
"avahi-glib.ppc64le" "avahi-glib.ppc64le"
], ],
"babel": [
"babel.noarch",
"python3-babel.noarch"
],
"babeltrace": [ "babeltrace": [
"libbabeltrace.ppc64le" "libbabeltrace.ppc64le"
], ],
@ -15075,10 +15067,6 @@
"avahi": [ "avahi": [
"avahi-glib.s390x" "avahi-glib.s390x"
], ],
"babel": [
"babel.noarch",
"python3-babel.noarch"
],
"babeltrace": [ "babeltrace": [
"libbabeltrace.s390x" "libbabeltrace.s390x"
], ],
@ -22377,10 +22365,6 @@
"avahi": [ "avahi": [
"avahi-glib.x86_64" "avahi-glib.x86_64"
], ],
"babel": [
"babel.noarch",
"python3-babel.noarch"
],
"babeltrace": [ "babeltrace": [
"libbabeltrace.x86_64" "libbabeltrace.x86_64"
], ],
@ -31239,7 +31223,6 @@
"python3-requests.noarch" "python3-requests.noarch"
], ],
"python-setuptools": [ "python-setuptools": [
"python3-setuptools-wheel.noarch",
"python3-setuptools.noarch" "python3-setuptools.noarch"
], ],
"python-six": [ "python-six": [
@ -32870,7 +32853,6 @@
"python3-requests.noarch" "python3-requests.noarch"
], ],
"python-setuptools": [ "python-setuptools": [
"python3-setuptools-wheel.noarch",
"python3-setuptools.noarch" "python3-setuptools.noarch"
], ],
"python-six": [ "python-six": [
@ -34452,7 +34434,6 @@
"python3-requests.noarch" "python3-requests.noarch"
], ],
"python-setuptools": [ "python-setuptools": [
"python3-setuptools-wheel.noarch",
"python3-setuptools.noarch" "python3-setuptools.noarch"
], ],
"python-six": [ "python-six": [
@ -36089,7 +36070,6 @@
"python3-requests.noarch" "python3-requests.noarch"
], ],
"python-setuptools": [ "python-setuptools": [
"python3-setuptools-wheel.noarch",
"python3-setuptools.noarch" "python3-setuptools.noarch"
], ],
"python-six": [ "python-six": [
@ -38232,9 +38212,6 @@
"pyparsing": [ "pyparsing": [
"pyparsing-doc.noarch" "pyparsing-doc.noarch"
], ],
"pyproject-rpm-macros": [
"pyproject-rpm-macros.noarch"
],
"pytest": [ "pytest": [
"python3-pytest.noarch" "python3-pytest.noarch"
], ],
@ -40495,9 +40472,6 @@
"pyparsing": [ "pyparsing": [
"pyparsing-doc.noarch" "pyparsing-doc.noarch"
], ],
"pyproject-rpm-macros": [
"pyproject-rpm-macros.noarch"
],
"pytest": [ "pytest": [
"python3-pytest.noarch" "python3-pytest.noarch"
], ],
@ -42717,9 +42691,6 @@
"pyparsing": [ "pyparsing": [
"pyparsing-doc.noarch" "pyparsing-doc.noarch"
], ],
"pyproject-rpm-macros": [
"pyproject-rpm-macros.noarch"
],
"pytest": [ "pytest": [
"python3-pytest.noarch" "python3-pytest.noarch"
], ],
@ -45054,9 +45025,6 @@
"pyparsing": [ "pyparsing": [
"pyparsing-doc.noarch" "pyparsing-doc.noarch"
], ],
"pyproject-rpm-macros": [
"pyproject-rpm-macros.noarch"
],
"pytest": [ "pytest": [
"python3-pytest.noarch" "python3-pytest.noarch"
], ],

View File

@ -87,6 +87,7 @@ additional_packages = [
"prefixdevname", #ENGCMP-4041 "prefixdevname", #ENGCMP-4041
"libcpuid", #ENGCMP-4068 "libcpuid", #ENGCMP-4068
"plocate", #ENGCMP-4074 "plocate", #ENGCMP-4074
"ktls-utils", #ENGCMP-4189
] ]
}), }),
("^BaseOS$", { ("^BaseOS$", {
@ -434,6 +435,27 @@ additional_packages = [
"intel-gpu-firmware", #ENGCMP-4150 "intel-gpu-firmware", #ENGCMP-4150
"nvidia-gpu-firmware", #ENGCMP-4150 "nvidia-gpu-firmware", #ENGCMP-4150
"pkcs11-provider", #ENGCMP-4181 "pkcs11-provider", #ENGCMP-4181
"ptyxis", #ENGCMP-4204
"liboqs", #ENGCMP-3895
"liboqs-devel", #ENGCMP-3895
"python3-pyqt6-devel", #ENGCMP-4144
"qt6-qt5compat-devel", #ENGCMP-4144
"qt6-qtlanguageserver-devel", #ENGCMP-4144
"qt6-qtquick3d-devel", #ENGCMP-4144
"qt6-qtquicktimeline-devel", #ENGCMP-4144
"qt6-qtremoteobjects-devel", #ENGCMP-4144
"qt6-qtscxml-devel", #ENGCMP-4144
"qt6-qtserialbus-devel", #ENGCMP-4144
"qt6-qtshadertools-devel", #ENGCMP-4144
"qt6-qtspeech-devel", #ENGCMP-4144
"qt6-qtspeech-speechd", #ENGCMP-4144
"qt6-assistant", #ENGCMP-4144
"qt6-qdbusviewer", #ENGCMP-4144
"qt6-qtwayland-devel", #ENGCMP-4144
"qt6-qtwayland", #ENGCMP-4144
"glib2-devel", #ENGCMP-4191
"plymouth-devel", #ENGCMP-4191
"poppler-qt6", #ENGCMP-4191
] ]
}), }),
("^AppStream$", { ("^AppStream$", {
@ -508,18 +530,6 @@ additional_packages = [
], ],
}), }),
("^SAP$", {
"*": [
"compat-sap-c++-12", # ENGCMP-2843
]
}),
("^SAPHANA$", {
"*": [
"compat-sap-c++-12", # ENGCMP-2843
]
}),
("^Buildroot$", { ("^Buildroot$", {
"*": [ "*": [
"*", "*",