Hello community,
here is the log from the commit of package patterns-base for openSUSE:Factory checked in at 2019-07-31 14:24:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/patterns-base (Old)
and /work/SRC/openSUSE:Factory/.patterns-base.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-base"
Wed Jul 31 14:24:39 2019 rev:37 rq:717151 version:20190612
Changes:
--------
--- /work/SRC/openSUSE:Factory/patterns-base/patterns-base.changes 2019-05-03 22:26:58.304281592 +0200
+++ /work/SRC/openSUSE:Factory/.patterns-base.new.4126/patterns-base.changes 2019-07-31 14:24:43.546346418 +0200
@@ -1,0 +2,16 @@
+Fri Jul 19 12:51:13 UTC 2019 - Dominique Leuenberger
+
+- Add %files section for basic_desktop, or the package won't be
+ generated.
+- Provide pattern() = basic_desktop
+
+-------------------------------------------------------------------
+Wed Jun 12 00:24:18 UTC 2019 - Simon Lees
+
+- Create basic_desktop pattern containing the desktop packages like
+ icewm that are wanted on a basic sles desktop but not in every
+ openSUSE install (boo#1124865)
+- .Remove some duplicated packages in x11_enhanced
+- Regenerate 32bit patterns
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-base.spec ++++++
--- /var/tmp/diff_new_pack.1pMoxG/_old 2019-07-31 14:24:44.406345442 +0200
+++ /var/tmp/diff_new_pack.1pMoxG/_new 2019-07-31 14:24:44.410345438 +0200
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_with betatest
Name: patterns-base
-Version: 20190206
+Version: 20190612
Release: 0
Summary: Patterns for Installation (base patterns)
License: MIT
@@ -248,6 +248,38 @@
################################################################################
+# This pattern contains everything the SLES x11 package used to have that
+# doesn't need to be in the openSUSE x11 package
+%package basic_desktop
+%pattern_graphicalenvironments
+Summary: A very basic desktop (previously part of x11 pattern)
+Group: Metapackages
+Provides: pattern() = basic_desktop
+Provides: pattern-icon() = pattern-desktop
+Provides: pattern-order() = 1802
+Provides: pattern-visible()
+# We want SLES-15 systems to install this pattern on upgrade to SLES-16
+%if !0%{?is_opensuse}
+Obsoletes: patterns-base-x11 < %{version}
+%endif
+Requires: pattern() = x11
+
+# choose icewm-default if you have a choice
+# icewm-lite is too lightweight in new release
+Requires: icewm-default
+Requires: icewm-theme-branding
+Recommends: libgnomesu
+Recommends: openssh-askpass-gnome
+
+%description basic_desktop
+This pattern installs a rather basic desktop (icewm)
+
+%files basic_desktop
+%dir %{_docdir}/patterns
+%{_docdir}/patterns/basic_desktop.txt
+
+################################################################################
+
%if 0%{?is_opensuse}
%package console
%pattern_basetechnologies
@@ -811,17 +843,13 @@
Requires: yast2-qt
Recommends: dejavu-fonts
Recommends: google-roboto-fonts
-# choose icewm-default if you have a choice
-# icewm-lite is too lightweight in new release
-Recommends: icewm-default
-Recommends: icewm-theme-branding
Recommends: libyui-qt
Recommends: libyui-qt-pkg
# Recommend lightdm so it gets installed by default
# rather then xdm bsc#1081760
+# Todo: Require DisplayManger and suggest lightdm
Recommends: lightdm
Recommends: noto-sans-fonts
-Recommends: openssh-askpass-gnome
Recommends: tigervnc
Recommends: x11-tools
Recommends: xdmbgrd
@@ -886,14 +914,7 @@
Recommends: fonts-config
Recommends: fribidi
Recommends: ghostscript-x11
-# choose icewm-default if you have a choice
-# icewm-lite is too lightweight in new release
-Recommends: icewm-default
-# Recommend lightdm so it gets installed by default
-# rather then xdm bsc#1081760
-Recommends: lightdm
Recommends: numlockx
-Recommends: tigervnc
# #353229 - drag in empty replacements
Recommends: translation-update
Recommends: xauth
@@ -1093,7 +1114,7 @@
for i in apparmor base enhanced_base minimal_base \
sw_management x11 x11_enhanced; do
%else
-for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhanced; do
+for i in apparmor base basic_desktop enhanced_base minimal_base sw_management x11 x11_enhanced; do
%endif
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}%{_docdir}/patterns/$i.txt"
@@ -1104,12 +1125,12 @@
# These packages don't generate a 32bit pattern
for i in \
%if 0%{?is_opensuse}
-apparmor_opt basesystem console documentation enhanced_base_opt transactional_base update_test x11_opt \
+apparmor_opt basesystem basic_desktop console documentation enhanced_base_opt transactional_base update_test x11_opt \
%else
%ifnarch s390 s390x
32bit \
%endif
-basesystem documentation \
+basesystem basic_desktop documentation \
%endif
%ifarch armv6hl armv7hl aarch64
x11_raspberrypi \
++++++ pattern-definition-32bit.txt ++++++
--- /var/tmp/diff_new_pack.1pMoxG/_old 2019-07-31 14:24:44.450345393 +0200
+++ /var/tmp/diff_new_pack.1pMoxG/_new 2019-07-31 14:24:44.450345393 +0200
@@ -57,6 +57,8 @@
Recommends: lshw-32bit
Recommends: lsvpd-32bit
Recommends: ppc64-diag-32bit
+Recommends: haveged-32bit
+Recommends: issue-generator-32bit
Provides: pattern() = base%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-base)
@@ -177,7 +179,6 @@
Recommends: xz-32bit
Recommends: zisofs-tools-32bit
Recommends: dmidecode-32bit
-Recommends: haveged-32bit
Recommends: hfsutils-32bit
Recommends: mouseemu-32bit
Recommends: pdisk-32bit
@@ -294,13 +295,10 @@
Recommends: yast2-qt-32bit
Recommends: dejavu-fonts-32bit
Recommends: google-roboto-fonts-32bit
-Recommends: icewm-default-32bit
-Recommends: icewm-theme-branding-32bit
Recommends: libyui-qt-32bit
Recommends: libyui-qt-pkg-32bit
Recommends: lightdm-32bit
Recommends: noto-sans-fonts-32bit
-Recommends: openssh-askpass-gnome-32bit
Recommends: tigervnc-32bit
Recommends: x11-tools-32bit
Recommends: xdmbgrd-32bit
@@ -346,10 +344,7 @@
Recommends: fonts-config-32bit
Recommends: fribidi-32bit
Recommends: ghostscript-x11-32bit
-Recommends: icewm-default-32bit
-Recommends: lightdm-32bit
Recommends: numlockx-32bit
-Recommends: tigervnc-32bit
Recommends: translation-update-32bit
Recommends: xauth-32bit
Recommends: xdmbgrd-32bit
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.1pMoxG/_old 2019-07-31 14:24:44.474345365 +0200
+++ /var/tmp/diff_new_pack.1pMoxG/_new 2019-07-31 14:24:44.474345365 +0200
@@ -1,3 +1,3 @@
#!/bin/sh
-./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s console -s documentation -s enhanced_base_opt -s minimal_base_conflicts -s readonly_root_tools -s transactional_base -s update_test -s x11_opt -s x11_raspberrypi > pattern-definition-32bit.txt
+./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s basic_desktop -s console -s documentation -s enhanced_base_opt -s minimal_base_conflicts -s readonly_root_tools -s transactional_base -s update_test -s x11_opt -s x11_raspberrypi > pattern-definition-32bit.txt