diff --git a/.files b/.files
index d590413..0661bd6 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d204573..a27b18a 100644
--- a/.rev
+++ b/.rev
@@ -1172,4 +1172,12 @@ vendor "openSUSE", product "MicroOS" though.
dimstar_suse
Drop wireshark from the DVD
+
+ 2f9942469436d2751e1048de8ae395b1
+ unknown
+
+ dimstar_suse
+ Switch icon names to reflect the distribution, to avoid icon themes from displaying the wrong logo
+ 917961
+
diff --git a/.servicemark b/.servicemark
deleted file mode 100644
index 927789b..0000000
--- a/.servicemark
+++ /dev/null
@@ -1 +0,0 @@
-f0b0b025e365793ac899abaf091c671b
diff --git a/MicroOS-release.spec.in b/MicroOS-release.spec.in
index 3643bea..1dedc28 100644
--- a/MicroOS-release.spec.in
+++ b/MicroOS-release.spec.in
@@ -216,7 +216,7 @@ CPE_NAME="cpe:/o:opensuse:microos:%{version}"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
DOCUMENTATION_URL="https://en.opensuse.org/Portal:MicroOS"
-LOGO="distributor-logo"
+LOGO="distributor-logo-MicroOS"
EOF
ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
diff --git a/groups.yml b/groups.yml
index 51a789b..69cc9b0 100644
--- a/groups.yml
+++ b/groups.yml
@@ -51,6 +51,8 @@ dvd:
- shim: [x86_64,aarch64]
- patterns-gnome-gnome: [required,suggested]
- patterns-gnome-gnome_basis: [required,suggested]
+ - patterns-gnome-gnome_basis_opt: [required,suggested]
+ - patterns-gnome-gnome_games: [required,suggested]
- patterns-gnome-gnome_imaging: [required,suggested]
- patterns-gnome-gnome_internet: [required,suggested]
- patterns-gnome-gnome_multimedia: [required,suggested]
@@ -68,6 +70,7 @@ dvd:
- patterns-kde-kde_office: [required,suggested]
- patterns-kde-kde_plasma: [suggested]
- patterns-kde-kde_utilities: [required,suggested]
+ - patterns-kde-kde_utilities_opt: [required,suggested]
- patterns-kde-kde_yast: [required,suggested]
- patterns-base-apparmor: [required,suggested]
- patterns-base-base: [required,suggested]
@@ -79,6 +82,7 @@ dvd:
- patterns-fonts-fonts: [required,suggested]
- patterns-games-games: [required,suggested]
- patterns-server-lamp_server: [required,suggested]
+ - patterns-desktop-laptop: [suggested]
- patterns-server-mail_server: [required,suggested]
- patterns-desktop-multimedia: [required,suggested]
- patterns-network-network_admin: [suggested]
@@ -252,7 +256,6 @@ dvd:
## attemt to shrink the DVD - 20151115 by dimstar: [locked]
- valgrind-devel: [locked]
- - wireshark: [locked]
## Further shrinkg the DVD - 20160330 by dimstar: [locked]
- ImageMagick-doc: [locked]
diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in
index 3e93581..67c36f0 100644
--- a/openSUSE-release.spec.in
+++ b/openSUSE-release.spec.in
@@ -216,7 +216,7 @@ CPE_NAME="cpe:/o:opensuse:tumbleweed:%{version}"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
DOCUMENTATION_URL="https://en.opensuse.org/Portal:Tumbleweed"
-LOGO="distributor-logo"
+LOGO="distributor-logo-Tumbleweed"
EOF
ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release