diff --git a/README.scripts b/README.scripts new file mode 100644 index 0000000..70b5243 --- /dev/null +++ b/README.scripts @@ -0,0 +1,2 @@ +This scripts dir contains only samples, but are generally not used directly. +In practice, sddm runtime uses items under /etc/sddm by default diff --git a/sddm.conf b/sddm.conf index 8ec978a..c4ec86a 100644 --- a/sddm.conf +++ b/sddm.conf @@ -39,7 +39,7 @@ [Users] # Default $PATH -#DefaultPath=/bin:/usr/bin:/usr/local/bin +#DefaultPath=/usr/local/bin:/usr/bin:/bin # Hidden shells # Users with these shells as their default won't be listed @@ -49,7 +49,7 @@ #HideUsers= # Maximum user id for displayed users -#MaximumUid=65000 +#MaximumUid=60000 # Minimum user id for displayed users #MinimumUid=1000 @@ -61,15 +61,31 @@ #RememberLastUser=true +[WaylandDisplay] +# Wayland session script path +# A script to execute when starting the desktop session +#SessionCommand=/etc/sddm/wayland-session + +# Session description directory +#SessionDir=/usr/share/wayland-sessions + + [XDisplay] # Xsetup script path # A script to execute when starting the display server -#DisplayCommand=/usr/share/sddm/scripts/Xsetup +#DisplayCommand=/etc/sddm/Xsetup + +# Xstop script path +# A script to execute when stopping the display server +#DisplayStopCommand=/etc/sddm/Xstop # Minimum VT # The lowest virtual terminal number that will be used. #MinimumVT=1 +# X server arguments +#ServerArguments=-nolisten tcp + # X server path #ServerPath=/usr/bin/X @@ -83,4 +99,7 @@ # Xauth path #XauthPath=/usr/bin/xauth +# Xephyr path +#XephyrPath=/usr/bin/Xephyr + diff --git a/sddm.spec b/sddm.spec index 2e71547..8682da0 100644 --- a/sddm.spec +++ b/sddm.spec @@ -2,7 +2,7 @@ Name: sddm Version: 0.13.0 -Release: 3%{?dist} +Release: 4%{?dist} # code GPLv2+, fedora theme CC-BY-SA License: GPLv2+ and CC-BY-SA Summary: QML based X11 desktop manager @@ -24,6 +24,8 @@ Source12: sddm-autologin.pam Source13: tmpfiles-sddm.conf # sample sddm.conf generated with sddm --example-config, and entries commented-out Source14: sddm.conf +# README.scripts +Source15: README.scripts # fedora theme files Source21: fedora-Main.qml @@ -78,7 +80,9 @@ A collection of sddm themes, including: circles, elarun, maldives, maui. %prep -%autosetup -p1 +%setup -q + +%patch101 -p1 -b .fedora_config %build @@ -88,7 +92,8 @@ pushd %{_target_platform} -DBUILD_MAN_PAGES:BOOL=ON \ -DENABLE_JOURNALD:BOOL=ON \ -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \ - -DUSE_QT5:BOOL=ON + -DUSE_QT5:BOOL=ON \ + -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session popd make %{?_smp_mflags} -C %{_target_platform} @@ -101,6 +106,7 @@ install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin install -Dpm 644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/sddm.conf install -Dpm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sddm.conf +install -Dpm 644 %{SOURCE15} %{buildroot}%{_datadir}/sddm/scripts/README.scripts mkdir -p %{buildroot}%{_localstatedir}/run/sddm mkdir -p %{buildroot}%{_localstatedir}/lib/sddm mkdir -p %{buildroot}%{_sysconfdir}/sddm/ @@ -177,6 +183,10 @@ exit 0 %changelog +* Mon Nov 16 2015 Rex Dieter - 0.13.0-4 +- rev sddm.conf for new defaults +- add /usr/share/sddm/scripts/README.scripts + * Sun Nov 15 2015 Rex Dieter - 0.13.0-3 - merge Configuration.h into fedora_config.patch - copy all scripts into /etc/sddm as %%config(noreplace)