From f73afbbabe2470268fcac2ba0e16f9c56d3686abd90112f42245bdd8f58fadb6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 28 Mar 2019 08:54:24 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/patterns-base revision 35.0 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=de15f3cd227f408b358e65e761052472 --- pattern-definition-32bit.txt | 9 +++++- patterns-base.changes | 10 ------- patterns-base.spec | 57 +++++++++++++++--------------------- pre_checkin.sh | 2 +- 4 files changed, 32 insertions(+), 46 deletions(-) diff --git a/pattern-definition-32bit.txt b/pattern-definition-32bit.txt index 61aa4d9..e005302 100644 --- a/pattern-definition-32bit.txt +++ b/pattern-definition-32bit.txt @@ -34,6 +34,7 @@ Recommends: shadow-32bit Recommends: util-linux-32bit Recommends: which-32bit Recommends: systemd-coredump-32bit +Recommends: busybox-static-32bit Recommends: bash-completion-32bit Recommends: btrfsprogs-32bit Recommends: ca-certificates-mozilla-32bit @@ -245,7 +246,6 @@ Recommends: system-user-nobody-32bit Recommends: systemd-32bit Recommends: udev-32bit Recommends: zypper-32bit -Recommends: busybox-static-32bit Recommends: rollback-helper-32bit Recommends: openSUSE-build-key-32bit Recommends: SUSEConnect-32bit @@ -294,10 +294,13 @@ Recommends: xorg-x11-server-32bit 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 @@ -343,7 +346,10 @@ Recommends: fontconfig-32bit 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 @@ -354,6 +360,7 @@ Recommends: yast2-control-center-gnome-32bit Recommends: yast2-scanner-32bit Recommends: MozillaFirefox-branding-SLE-32bit Recommends: desktop-data-SLE-32bit +Recommends: numlockx-32bit Recommends: openssh-askpass-32bit Recommends: susepaste-32bit Recommends: susepaste-screenshot-32bit diff --git a/patterns-base.changes b/patterns-base.changes index 2c58570..5809a9a 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 20 00:09:25 UTC 2019 - Simon Lees - -- Update version to 20190320 -- 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 - ------------------------------------------------------------------- Fri Mar 15 08:50:30 UTC 2019 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 8be20e6..0e3fada 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_with betatest Name: patterns-base -Version: 20190320 +Version: 20190206 Release: 0 Summary: Patterns for Installation (base patterns) License: MIT @@ -187,6 +187,8 @@ Requires: which %if ! 0%{?is_opensuse} Requires: systemd-coredump %endif +# Add some static base tool in case system explodes; Recommend only, as users are free to uninstall it +Recommends: busybox-static Recommends: bash-completion Recommends: btrfsprogs Recommends: ca-certificates-mozilla @@ -238,33 +240,6 @@ This is the base runtime system. It contains only a minimal multiuser booting s ################################################################################ -# 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-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) - -################################################################################ - %if 0%{?is_opensuse} %package console %pattern_basetechnologies @@ -687,8 +662,10 @@ Requires: system-user-nobody Requires: systemd Requires: udev Requires: zypper -# Add some static base tool in case system explodes -Recommends: busybox-static +# Note it makes no sense to recommend packages in minimal_base as it can't +# be installed with --no-recommends if your package can be Recommended rather +# then required it likely belongs in base and not here. +# rollback-helper is useful on Leap / SLE but not tumbleweed %if 0%{?sle_version} Requires: rollback-helper %endif @@ -830,13 +807,17 @@ Requires: xorg-x11-server 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 @@ -901,7 +882,14 @@ Recommends: fontconfig 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 @@ -924,6 +912,7 @@ Recommends: desktop-data-SLE %endif %if 0%{?is_opensuse} # people love having numlock configurable +Recommends: numlockx Recommends: openssh-askpass Recommends: susepaste Recommends: susepaste-screenshot @@ -1095,7 +1084,7 @@ mkdir -p %{buildroot}%{_docdir}/patterns for i in apparmor base enhanced_base minimal_base \ sw_management x11 x11_enhanced; do %else -for i in apparmor base basic_desktop enhanced_base minimal_base sw_management x11 x11_enhanced; do +for i in apparmor base 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" @@ -1111,7 +1100,7 @@ apparmor_opt basesystem console documentation enhanced_base_opt transactional_ba %ifnarch s390 s390x 32bit \ %endif -basesystem basic_desktop documentation \ +basesystem documentation \ %endif %ifarch armv6hl armv7hl aarch64 x11_raspberrypi \ diff --git a/pre_checkin.sh b/pre_checkin.sh index 49d47ee..de2fd15 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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