Attachment 8561 Details for Bug 19601 – patch for sddm.spec for using /etc/X11/xdm/Xsetup_0

[patch] patch for sddm.spec for using /etc/X11/xdm/Xsetup_0

sddm.patch (text/plain), 3.01 KB, created by Giuseppe Ghibò on 2016-10-18 00:37:42 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2016-10-18 00:37:42 CEST

Size: 3.01 KB

patch

obsolete

>Index: SOURCES/sddm.conf
>===================================================================
>--- SOURCES/sddm.conf	(revision 1061508)
>+++ SOURCES/sddm.conf	(working copy)
>@@ -65,7 +65,7 @@
> #
> #SessionCommand=
> #	Path of script to execute when starting the user session. This script receives the value of the "Exec" setting in the
>-#	".desktop" file of the selected	session and runs it. Default value is "/usr/share/sddm/scripts/Xsession".
>+#	".desktop" file of the selected	session and runs it. Default value is "/etc/X11/Xsession".
> #
> #SessionLogFile=
> #        Path to the user session log file, relative to the home directory.
>@@ -75,7 +75,7 @@
> #        Path to the Xauthority file, relative to the home directory. Default value is ".Xauthority".
> #
> #DisplayCommand=
>-#	Path of script to execute when starting the display server. Default value is "/usr/share/sddm/scripts/Xsetup".
>+#	Path of script to execute when starting the display server. Default value is "/etc/X11/xdm/Xsetup_0".
> #
> #DisplayStopCommand=
> #	Path of script to execute when stopping the display server. Default value is "/usr/share/sddm/scripts/Xstop".
>@@ -107,7 +107,7 @@
> #	Minimum user id of the users to be listed in the user interface. Default value is 1000.
> #
> #MaximumUid=
>-#	Maximum user id of the users to be listed in the user interface. Default value is 65000.
>+#	Maximum user id of the users to be listed in the user interface. Default value is 60000.
> #
> #HideUsers=
> #	Comma-separated list of Users that shouldn't show up in the user list. Default value is empty.
>Index: SPECS/sddm.spec
>===================================================================
>--- SPECS/sddm.spec	(revision 1061508)
>+++ SPECS/sddm.spec	(working copy)
>@@ -1,4 +1,4 @@
>-%define rel 8
>+%define rel 9
> 
> Name:		sddm
> Version:	0.14.0
>@@ -28,7 +28,8 @@
> # taken from examples at https://github.com/sddm/sddm/issues/501
> Patch0:         sddm-0.12.0-mga-autofocus.patch
> Patch1:         sddm-0.14-fix-swedish-translation.patch
>- 
>+Patch2:         sddm-0.14-cmake-display-command.patch
>+#
> BuildRequires:  extra-cmake-modules
> BuildRequires:	cmake
> BuildRequires:	systemd-devel
>@@ -87,6 +88,8 @@
> # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not
> # possible for normal users due to missing read permissions
> %cmake_qt5 \
>+	-DSESSION_COMMAND:FILEPATH=/etc/X11/Xsession \
>+	-DDISPLAY_COMMAND:FILEPATH=/etc/X11/xdm/Xsetup_0 \
> 	-DUSE_QT5=ON \
> 	-DBUILD_MAN_PAGES=ON \
> 	-DENABLE_JOURNALD=ON \
>@@ -97,6 +100,7 @@
> 
> %install
> make install/fast DESTDIR=%{buildroot} -C build
>+mv -f %{buildroot}%{_sysconfdir}/sddm.conf %{buildroot}%{_sysconfdir}/sddm.conf.default
> 
> # dm config
> install -Dpm 644 %{_sourcedir}/11sddm.conf %{buildroot}%{_datadir}/X11/dm.d/11sddm.conf
>@@ -165,6 +169,7 @@
> %files
> %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/
> %config(noreplace) %{_sysconfdir}/sddm.conf
>+%config(noreplace) %{_sysconfdir}/sddm.conf.default
> %config(noreplace) %{_sysconfdir}/pam.d/sddm
> %config(noreplace) %{_sysconfdir}/pam.d/sddm-autologin
> %config(noreplace) %{_sysconfdir}/pam.d/sddm-greeter

Index: SOURCES/sddm.conf
===================================================================
--- SOURCES/sddm.conf	(revision 1061508)
+++ SOURCES/sddm.conf	(working copy)
@@ -65,7 +65,7 @@
 #
 #SessionCommand=
 #	Path of script to execute when starting the user session. This script receives the value of the "Exec" setting in the
-#	".desktop" file of the selected	session and runs it. Default value is "/usr/share/sddm/scripts/Xsession".
+#	".desktop" file of the selected	session and runs it. Default value is "/etc/X11/Xsession".
 #
 #SessionLogFile=
 #        Path to the user session log file, relative to the home directory.
@@ -75,7 +75,7 @@
 #        Path to the Xauthority file, relative to the home directory. Default value is ".Xauthority".
 #
 #DisplayCommand=
-#	Path of script to execute when starting the display server. Default value is "/usr/share/sddm/scripts/Xsetup".
+#	Path of script to execute when starting the display server. Default value is "/etc/X11/xdm/Xsetup_0".
 #
 #DisplayStopCommand=
 #	Path of script to execute when stopping the display server. Default value is "/usr/share/sddm/scripts/Xstop".
@@ -107,7 +107,7 @@
 #	Minimum user id of the users to be listed in the user interface. Default value is 1000.
 #
 #MaximumUid=
-#	Maximum user id of the users to be listed in the user interface. Default value is 65000.
+#	Maximum user id of the users to be listed in the user interface. Default value is 60000.
 #
 #HideUsers=
 #	Comma-separated list of Users that shouldn't show up in the user list. Default value is empty.
Index: SPECS/sddm.spec
===================================================================
--- SPECS/sddm.spec	(revision 1061508)
+++ SPECS/sddm.spec	(working copy)
@@ -1,4 +1,4 @@
-%define rel 8
+%define rel 9
 
 Name:		sddm
 Version:	0.14.0
@@ -28,7 +28,8 @@
 # taken from examples at https://github.com/sddm/sddm/issues/501
 Patch0:         sddm-0.12.0-mga-autofocus.patch
 Patch1:         sddm-0.14-fix-swedish-translation.patch
- 
+Patch2:         sddm-0.14-cmake-display-command.patch
+#
 BuildRequires:  extra-cmake-modules
 BuildRequires:	cmake
 BuildRequires:	systemd-devel
@@ -87,6 +88,8 @@
 # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not
 # possible for normal users due to missing read permissions
 %cmake_qt5 \
+	-DSESSION_COMMAND:FILEPATH=/etc/X11/Xsession \
+	-DDISPLAY_COMMAND:FILEPATH=/etc/X11/xdm/Xsetup_0 \
 	-DUSE_QT5=ON \
 	-DBUILD_MAN_PAGES=ON \
 	-DENABLE_JOURNALD=ON \
@@ -97,6 +100,7 @@
 
 %install
 make install/fast DESTDIR=%{buildroot} -C build
+mv -f %{buildroot}%{_sysconfdir}/sddm.conf %{buildroot}%{_sysconfdir}/sddm.conf.default
 
 # dm config
 install -Dpm 644 %{_sourcedir}/11sddm.conf %{buildroot}%{_datadir}/X11/dm.d/11sddm.conf
@@ -165,6 +169,7 @@
 %files
 %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/
 %config(noreplace) %{_sysconfdir}/sddm.conf
+%config(noreplace) %{_sysconfdir}/sddm.conf.default
 %config(noreplace) %{_sysconfdir}/pam.d/sddm
 %config(noreplace) %{_sysconfdir}/pam.d/sddm-autologin
 %config(noreplace) %{_sysconfdir}/pam.d/sddm-greeter

Actions: View | Diff

Attachments on bug 19601: 8551 | 8561 | 8562 | 8572 | 8589 | 8590 | 8591 | 8599