From 77c965b2b6d3baac6c84ac70c49119ab2fe58d868f1e5f6654202eb88a914f20 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 2 May 2019 08:18:57 +0000 Subject: [PATCH] Accepting request 689098 from home:favogt:jscSLE-4142 - Fix x11_raspberrypi (jsc#SLE-4142): * Use only Requires, on JeOS recommmends and suggests are no-ops * Remove xf86-input-void, obsolete (and not in SLE) * Require base and x11 patterns * Add some YaST modules, otherwise the control center is empty OBS-URL: https://build.opensuse.org/request/show/689098 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=97 --- patterns-base.changes | 9 +++ patterns-base.spec | 157 ++++++++++++++++++++++-------------------- 2 files changed, 90 insertions(+), 76 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 1907767..e784562 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -11,6 +11,15 @@ Mon Apr 29 12:37:44 UTC 2019 - Frederic Crozat - Move haveged from enhanced_base to minimal_base (bsc#1131369). +------------------------------------------------------------------- +Tue Mar 26 12:51:08 UTC 2019 - Fabian Vogt + +- Fix x11_raspberrypi (jsc#SLE-4142): + * Use only Requires, on JeOS recommmends and suggests are no-ops + * Remove xf86-input-void, obsolete (and not in SLE) + * Require base and x11 patterns + * Add some YaST modules, otherwise the control center is empty + ------------------------------------------------------------------- Fri Mar 15 08:50:30 UTC 2019 - Fabian Vogt diff --git a/patterns-base.spec b/patterns-base.spec index 109332f..5c784a4 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -982,91 +982,96 @@ Provides: pattern() = x11_raspberrypi Provides: pattern-icon() = pattern-x11 Provides: pattern-order() = 1803 Provides: pattern-visible() - +# Use only Requires - it's meant to be used on JeOS, which ignores Recommends # Based on SUSE:SLE-15:GA:RaspberryPI/kiwi-templates-SLES15-JeOS/JeOS.kiwi +# Patterns +Requires: pattern() = base +Requires: pattern() = x11 # Drivers -Recommends: xf86-input-evdev -Recommends: xf86-input-void -Recommends: xf86-input-libinput -Recommends: xf86-video-fbdev +Requires: xf86-input-evdev +Requires: xf86-input-libinput +Requires: 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 +Requires: gconf2 +Requires: gtk2-metatheme-adwaita +Requires: gtk3-metatheme-adwaita +Requires: x11-tools +Requires: x11perf +Requires: xauth +Requires: xbacklight +Requires: xclock +Requires: xconsole +Requires: xcursor-themes +Requires: xcursorgen +Requires: xdg-user-dirs +Requires: xdg-user-dirs-gtk +Requires: xdg-user-dirs-gtk-lang +Requires: xdg-utils +Requires: xdm +Requires: xdmbgrd +Requires: xdpyinfo +Requires: xev +Requires: xeyes +Requires: xfd +Requires: xfontsel +Requires: xgamma +Requires: xhost +Requires: xinit +Requires: xinput +Requires: xkbcomp +Requires: xkbevd +Requires: xkbprint +Requires: xkbutils +Requires: xkeyboard-config +Requires: xkill +Requires: xlogo +Requires: xlsatoms +Requires: xlsclients +Requires: xlsfonts +Requires: xmag +Requires: xmessage +Requires: xmodmap +Requires: xorg-x11 +Requires: xorg-x11-fonts-core +Requires: xorg-x11-server +Requires: xorg-x11-server-extra +Requires: xprop +Requires: xrandr +Requires: xrdb +Requires: xrestop +Requires: xscope +Requires: xscreensaver +Requires: xscreensaver-data +Requires: xset +Requires: xsetmode +Requires: xsetpointer +Requires: xsetroot +Requires: xterm +Requires: xtermset +Requires: xvinfo +Requires: xwd +Requires: xwininfo +Requires: yast2-packager +Requires: yast2-snapper +Requires: yast2-x11 # bsc#1095870 -Recommends: libyui-qt-pkg -Recommends: yast2-control-center-qt -Suggests: gtk3-metatheme-adwaita -Suggests: gtk2-metatheme-adwaita +Requires: libyui-ncurses-pkg +Requires: libyui-qt-pkg +Requires: yast2-control-center-qt # Branding %if ! 0%{?is_opensuse} -Suggests: MozillaFirefox-branding-SLE +Requires: 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 +Requires: icewm +Requires: icewm-default +Requires: icewm-lite +Requires: icewm-theme-branding +Requires: polkit-default-privs +Requires: polkit-gnome-lang # for IceWM taskbar mailbox icon (bsc#1093913) -Recommends: mutt -Suggests: mutt-lang +Requires: mutt +Requires: 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.