From 70ac7ff040673f749a535453d8ddfde32a6ac009007173eda60f198cb7c39321 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 30 Jan 2024 06:19:55 +0000 Subject: [PATCH] Drop more suggests - we need spce OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=260 --- groups.yml | 12 ++++++------ openSUSE-release.spec.in | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/groups.yml b/groups.yml index a2fdf6d..a5c4f51 100644 --- a/groups.yml +++ b/groups.yml @@ -98,17 +98,17 @@ dvd: - patterns-base-enhanced_base: [required,suggested] - patterns-server-file_server: [required,suggested] - patterns-fonts-fonts: [required] - - patterns-server-lamp_server: [required,suggested] - - patterns-server-mail_server: [required,suggested] + - patterns-server-lamp_server: [required] + - patterns-server-mail_server: [required] - patterns-desktop-multimedia: [required] - - patterns-office-office: [required,suggested] - - patterns-server-printing: [required,suggested] + - patterns-office-office: [required] + - patterns-server-printing: [required] - patterns-media-rest_cd_core: [required] - patterns-base-sw_management: [required,suggested] - patterns-gnome-sw_management_gnome: [required] - patterns-base-basic_desktop: [required,suggested] - patterns-base-selinux: [required,suggested] - - patterns-base-transactional_base: [required,suggested] + - patterns-base-transactional_base: [required] - patterns-base-x11: [required,suggested] - patterns-xfce-xfce: [suggested] - patterns-xfce-xfce_basis: [suggested] @@ -123,7 +123,7 @@ dvd: - patterns-server-kvm_server - patterns-server-kvm_tools - patterns-base-minimal_base: [required,suggested] - - patterns-yast-x11_yast: [required,suggested] + - patterns-yast-x11_yast: [required] - patterns-server-xen_server: [x86_64] # bnc#431280 (Japanese fonts) - clicfs diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index c4a6d29..3ae65ea 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -218,7 +218,10 @@ ID_LIKE="opensuse suse" VERSION_ID="$VERSION_ID" PRETTY_NAME="openSUSE Tumbleweed" ANSI_COLOR="0;32" -CPE_NAME="cpe:/o:opensuse:tumbleweed:%{version}" +# CPE 2.3 format, boo#1217921 +CPE_NAME="cpe:2.3:o:opensuse:tumbleweed:%{version}:*:*:*:*:*:*:*" +#CPE 2.2 format +#CPE_NAME="cpe:/o:opensuse:tumbleweed:%{version}" BUG_REPORT_URL="https://bugzilla.opensuse.org" SUPPORT_URL="https://bugs.opensuse.org" HOME_URL="https://www.opensuse.org"