commit sddm for openSUSE:Factory
Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2015-09-27 14:32:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sddm" Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2015-09-11 09:01:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-09-27 14:31:26.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Sep 24 17:41:08 UTC 2015 - hrvoje.senjan@gmail.com + +- Added shadow BuildRequires, it's needed to check UID_MIN & UID_MAX + from /etc/login.defs + +------------------------------------------------------------------- +Sat Sep 12 17:28:12 UTC 2015 - wbauer@tmo.at + +- Change the theme to "maui" in the shipped sddm.conf, + sddm-branding-openSUSE sets it to "breeze" on installation. +- Remove the superfluous requirement for "breeze". This is not + needed even with the "breeze" theme, as it is actually part of + plasma5-workspace which is required by sddm-branding-openSUSE + anyway. +- sddm-branding-openSUSE should PreReq sddm, otherwise the config + might not exist. +- Make the regexps for sed stricter to really only modify the theme + setting when installing/uninstalling sddm-branding-openSUSE. + Otherwise it would e.g. also replace CursorTheme=breeze_cursors + with CursorTheme=maui_cursors... + Also only modify the config on new installation, not during + updates. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.DwSXNJ/_old 2015-09-27 14:31:27.000000000 +0200 +++ /var/tmp/diff_new_pack.DwSXNJ/_new 2015-09-27 14:31:27.000000000 +0200 @@ -49,6 +49,8 @@ BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: python-docutils +# Autodetect UID_MIN and UID_MAX from /etc/login.defs +BuildRequires: shadow BuildRequires: systemd-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -56,7 +58,6 @@ BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(xcb-xkb) -Requires: breeze Requires: sddm-branding = %{version} # Merged the -lang package back into the main package Obsoletes: %{name}-lang <= %{version} @@ -70,6 +71,7 @@ %package branding-openSUSE Summary: Lightweight QML-based display manager. openSUSE branding Group: System/GUI/KDE +PreReq: sddm Requires: plasma5-workspace Supplements: packageand(plasma5-workspace:branding-openSUSE) Provides: sddm-branding = %{version} @@ -135,13 +137,13 @@ -d /var/lib/sddm sddm 2> /dev/null || : %post branding-openSUSE -if [ -f /etc/sddm.conf ]; then - sed -i -e 's/maui/breeze/g' /etc/sddm.conf +if [ $1 -eq 1 -a -f /etc/sddm.conf ]; then + sed -i -e 's/^Current=maui$/Current=breeze/g' /etc/sddm.conf fi %postun branding-openSUSE if [ $1 -eq 0 -a -f /etc/sddm.conf ]; then - sed -i -e 's/breeze/maui/g' /etc/sddm.conf + sed -i -e 's/^Current=breeze$/Current=maui/g' /etc/sddm.conf fi %files ++++++ sddm.conf ++++++ --- /var/tmp/diff_new_pack.DwSXNJ/_old 2015-09-27 14:31:27.000000000 +0200 +++ /var/tmp/diff_new_pack.DwSXNJ/_new 2015-09-27 14:31:27.000000000 +0200 @@ -1,5 +1,5 @@ [Theme] -Current=breeze +Current=maui CursorTheme=breeze_cursors [XDisplay]
participants (1)
-
root@hilbert.suse.de