Accepting request 682650 from system:install:head
OBS-URL: https://build.opensuse.org/request/show/682650 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-base?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
cc3cc85e01
@ -24,7 +24,7 @@ The 32bit pattern complementing apparmor.
|
||||
#-------------------------------------------------------------------
|
||||
#
|
||||
%package base-32bit
|
||||
Summary: Base System
|
||||
Summary: Minimal Base System
|
||||
Recommends: e2fsprogs-32bit
|
||||
Recommends: kmod-32bit
|
||||
Recommends: openssh-32bit
|
||||
@ -33,6 +33,8 @@ Recommends: polkit-default-privs-32bit
|
||||
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
|
||||
@ -221,34 +223,29 @@ The 32bit pattern complementing enhanced_base.
|
||||
#-------------------------------------------------------------------
|
||||
#
|
||||
%package minimal_base-32bit
|
||||
Summary: Base System
|
||||
Summary: Minimal Appliance Base
|
||||
Recommends: aaa_base-32bit
|
||||
Recommends: bash-32bit
|
||||
Recommends: busybox-static-32bit
|
||||
Recommends: coreutils-32bit
|
||||
Recommends: device-mapper-32bit
|
||||
Recommends: distribution-release-32bit
|
||||
Recommends: dracut-32bit
|
||||
Recommends: elfutils-32bit
|
||||
Recommends: filesystem-32bit
|
||||
Recommends: glibc-32bit
|
||||
Recommends: iproute2-32bit
|
||||
Recommends: kbd-32bit
|
||||
Recommends: openssh-32bit
|
||||
Recommends: pam-32bit
|
||||
Recommends: procps-32bit
|
||||
Recommends: rpm-32bit
|
||||
Recommends: sysconfig-32bit
|
||||
Recommends: system-group-hardware-32bit
|
||||
Recommends: system-group-wheel-32bit
|
||||
Recommends: system-user-nobody-32bit
|
||||
Recommends: system-user-bin-32bit
|
||||
Recommends: system-user-daemon-32bit
|
||||
Recommends: system-user-nobody-32bit
|
||||
Recommends: systemd-32bit
|
||||
Recommends: sysvinit-tools-32bit
|
||||
Recommends: udev-32bit
|
||||
Recommends: zypper-32bit
|
||||
Recommends: systemd-coredump-32bit
|
||||
Recommends: rollback-helper-32bit
|
||||
Recommends: openSUSE-build-key-32bit
|
||||
Recommends: SUSEConnect-32bit
|
||||
@ -339,7 +336,7 @@ Recommends: pattern()-32bit
|
||||
Recommends: glibc-locale-32bit
|
||||
Recommends: xkeyboard-config-32bit
|
||||
Recommends: xorg-x11-essentials-32bit
|
||||
Recommends: web-browser-32bit
|
||||
Recommends: web_browser-32bit
|
||||
Recommends: cabextract-32bit
|
||||
Recommends: command-not-found-32bit
|
||||
Recommends: dbus-1-glib-32bit
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 6 17:43:30 UTC 2019 - Andreas Färber <afaerber@suse.de>
|
||||
|
||||
- Re-run pre_checkin.sh, updating -32bit patterns
|
||||
- Add pattern x11_raspberrypi (fate#326509, jsc#SLE-4142)
|
||||
This is to cover the delta between SLES 15 GA and SP1 JeOS images
|
||||
to allow the user to recreate its IceWM desktop without requiring
|
||||
a lengthy list of packages.
|
||||
Extended to openSUSE on request by fcrozat.
|
||||
- Insert comments to keep format_spec_file from reordering too much
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 25 19:59:06 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package patterns-base
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,7 +12,7 @@
|
||||
# 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/
|
||||
#
|
||||
|
||||
|
||||
@ -123,6 +123,7 @@ Provides: pattern() = apparmor_opt
|
||||
Provides: pattern-extends() = apparmor
|
||||
Provides: pattern-icon() = pattern-apparmor
|
||||
Provides: pattern-order() = 1080
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-apparmor_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-apparmor_opt < %{version}
|
||||
Requires: pattern() = minimal_base
|
||||
@ -227,7 +228,7 @@ Recommends: lsvpd
|
||||
%endif
|
||||
%ifarch ppc64 ppc64le
|
||||
# bsc#1098849
|
||||
Requires: ppc64-diag
|
||||
Requires: ppc64-diag
|
||||
%endif
|
||||
|
||||
%description base
|
||||
@ -248,6 +249,7 @@ Provides: pattern() = console
|
||||
Provides: pattern-icon() = pattern-cli
|
||||
Provides: pattern-order() = 1120
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-console = %{version}
|
||||
Obsoletes: patterns-openSUSE-console < %{version}
|
||||
Requires: pattern() = enhanced_base
|
||||
@ -572,6 +574,7 @@ Provides: pattern() = enhanced_base_opt
|
||||
Provides: pattern-extends() = enhanced_base
|
||||
Provides: pattern-icon() = pattern-software-management
|
||||
Provides: pattern-order() = 1040
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-enhanced_base_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-enhanced_base_opt < %{version}
|
||||
|
||||
@ -633,6 +636,7 @@ Provides: pattern() = minimal_base
|
||||
Provides: pattern-icon() = pattern-basis
|
||||
Provides: pattern-order() = 5190
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-minimal_base = %{version}
|
||||
Obsoletes: patterns-openSUSE-minimal_base < %{version}
|
||||
|
||||
@ -652,9 +656,9 @@ Requires: rpm
|
||||
Requires: sysconfig
|
||||
Requires: system-group-hardware
|
||||
Requires: system-group-wheel
|
||||
Requires: system-user-nobody
|
||||
Requires: system-user-bin
|
||||
Requires: system-user-daemon
|
||||
Requires: system-user-nobody
|
||||
Requires: systemd
|
||||
Requires: udev
|
||||
Requires: zypper
|
||||
@ -753,6 +757,7 @@ Provides: pattern() = update_test
|
||||
Provides: pattern-icon() = pattern-tests
|
||||
Provides: pattern-order() = 1380
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-update_test = %{version}
|
||||
Obsoletes: patterns-openSUSE-update_test < %{version}
|
||||
|
||||
@ -800,7 +805,7 @@ Requires: xorg-x11-server
|
||||
Requires: yast2-qt
|
||||
Recommends: dejavu-fonts
|
||||
Recommends: google-roboto-fonts
|
||||
# chooce icewm-default if you have a choice
|
||||
# choose icewm-default if you have a choice
|
||||
# icewm-lite is too lightweight in new release
|
||||
Recommends: icewm-default
|
||||
Recommends: icewm-theme-branding
|
||||
@ -875,7 +880,7 @@ Recommends: fontconfig
|
||||
Recommends: fonts-config
|
||||
Recommends: fribidi
|
||||
Recommends: ghostscript-x11
|
||||
# chooce icewm-default if you have a choice
|
||||
# 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
|
||||
@ -932,6 +937,7 @@ Provides: pattern() = x11_opt
|
||||
Provides: pattern-extends() = x11
|
||||
Provides: pattern-icon() = pattern-x11
|
||||
Provides: pattern-order() = 1680
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-x11_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-x11_opt < %{version}
|
||||
Requires: pattern() = enhanced_base
|
||||
@ -961,6 +967,111 @@ The X Window System provides the only standard platform-independent networked gr
|
||||
|
||||
################################################################################
|
||||
|
||||
%ifarch armv6hl armv7hl aarch64
|
||||
%package x11_raspberrypi
|
||||
%pattern_graphicalenvironments
|
||||
Summary: X Window System
|
||||
Group: Metapackages
|
||||
Provides: pattern() = x11_raspberrypi
|
||||
Provides: pattern-icon() = pattern-x11
|
||||
Provides: pattern-order() = 1803
|
||||
Provides: pattern-visible()
|
||||
|
||||
# Based on SUSE:SLE-15:GA:RaspberryPI/kiwi-templates-SLES15-JeOS/JeOS.kiwi
|
||||
# Drivers
|
||||
Recommends: xf86-input-evdev
|
||||
Recommends: xf86-input-void
|
||||
Recommends: xf86-input-libinput
|
||||
Recommends: xf86-video-fbdev
|
||||
# Other X11 packages
|
||||
Suggests: gconf2
|
||||
Suggests: xfd
|
||||
Suggests: xfontsel
|
||||
Suggests: xgamma
|
||||
Suggests: xhost
|
||||
Suggests: xinit
|
||||
Suggests: xinput
|
||||
Suggests: xkbcomp
|
||||
Suggests: xkbevd
|
||||
Suggests: xkbprint
|
||||
Suggests: xkbutils
|
||||
Suggests: xkeyboard-config
|
||||
Suggests: xkill
|
||||
Suggests: xlogo
|
||||
Suggests: xlsatoms
|
||||
Suggests: xlsclients
|
||||
Suggests: xlsfonts
|
||||
Suggests: xmag
|
||||
Suggests: xmessage
|
||||
Suggests: xmodmap
|
||||
Suggests: xorg-x11
|
||||
Suggests: xorg-x11-fonts-core
|
||||
Suggests: xorg-x11-server
|
||||
Suggests: xorg-x11-server-extra
|
||||
Suggests: xprop
|
||||
Suggests: xrandr
|
||||
Suggests: xrdb
|
||||
Suggests: xrestop
|
||||
Suggests: xscope
|
||||
Suggests: xscreensaver
|
||||
Suggests: xscreensaver-data
|
||||
Suggests: xset
|
||||
Suggests: xsetmode
|
||||
Suggests: xsetpointer
|
||||
Suggests: xsetroot
|
||||
Suggests: xterm
|
||||
Suggests: xtermset
|
||||
Suggests: xvinfo
|
||||
Suggests: xwd
|
||||
Suggests: xwininfo
|
||||
Suggests: xdm
|
||||
Suggests: x11-tools
|
||||
Suggests: x11perf
|
||||
Suggests: xauth
|
||||
Suggests: xbacklight
|
||||
Suggests: xclock
|
||||
Suggests: xconsole
|
||||
Suggests: xcursor-themes
|
||||
Suggests: xcursorgen
|
||||
Suggests: xdg-user-dirs
|
||||
Suggests: xdg-user-dirs-gtk
|
||||
Suggests: xdg-user-dirs-gtk-lang
|
||||
Suggests: xdg-utils
|
||||
Suggests: xdmbgrd
|
||||
Suggests: xdpyinfo
|
||||
Suggests: xev
|
||||
Suggests: xeyes
|
||||
Suggests: yast2-x11
|
||||
# bsc#1095870
|
||||
Recommends: libyui-qt-pkg
|
||||
Recommends: yast2-control-center-qt
|
||||
Suggests: gtk3-metatheme-adwaita
|
||||
Suggests: gtk2-metatheme-adwaita
|
||||
# Branding
|
||||
%if ! 0%{?is_opensuse}
|
||||
Suggests: MozillaFirefox-branding-SLE
|
||||
%endif
|
||||
# X11/IceWM-specific packages
|
||||
Recommends: icewm
|
||||
Suggests: icewm-lite
|
||||
Recommends: icewm-default
|
||||
Recommends: icewm-theme-branding
|
||||
Suggests: polkit-gnome-lang
|
||||
Recommends: polkit-default-privs
|
||||
# for IceWM taskbar mailbox icon (bsc#1093913)
|
||||
Recommends: mutt
|
||||
Suggests: mutt-lang
|
||||
|
||||
%description x11_raspberrypi
|
||||
The X Window System provides the only standard platform-independent networked graphical window system bridging the heterogeneous platforms in today's enterprise: from network servers to desktops, thin clients, laptops, and handhelds, independent of operating system and hardware.
|
||||
|
||||
%files x11_raspberrypi
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/x11_raspberrypi.txt
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
|
||||
%prep
|
||||
|
||||
%build
|
||||
@ -980,15 +1091,19 @@ for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhance
|
||||
done
|
||||
|
||||
# These packages don't generate a 32bit pattern
|
||||
%if 0%{?is_opensuse}
|
||||
for i in apparmor_opt basesystem console documentation enhanced_base_opt transactional_base update_test x11_opt; do
|
||||
%else
|
||||
for i in \
|
||||
%if 0%{?is_opensuse}
|
||||
apparmor_opt basesystem console documentation enhanced_base_opt transactional_base update_test x11_opt \
|
||||
%else
|
||||
%ifnarch s390 s390x
|
||||
32bit \
|
||||
%endif
|
||||
basesystem documentation; do
|
||||
basesystem documentation \
|
||||
%endif
|
||||
%ifarch armv6hl armv7hl aarch64
|
||||
x11_raspberrypi \
|
||||
%endif
|
||||
; do
|
||||
echo "This file marks the pattern $i to be installed." \
|
||||
>"%{buildroot}%{_docdir}/patterns/$i.txt"
|
||||
done
|
||||
|
||||
@ -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 > 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user