Attachment 8599 Details for Bug 19601 – preserve original sddm Xsession scripts

[patch] preserve original sddm Xsession scripts

sddm.diff (text/plain), 1.15 KB, created by Giuseppe Ghibò on 2016-10-26 19:17:38 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2016-10-26 19:17:38 CEST

Size: 1.15 KB

patch

obsolete

>Index: sddm.spec
>===================================================================
>--- sddm.spec	(revision 1063430)
>+++ sddm.spec	(working copy)
>@@ -1,4 +1,4 @@
>-%define rel 10
>+%define rel 11
> 
> # this package links to the scripts Xsession and Xsetup from the xinitrc
> # package. Check that these links are always matching each other, across the future
>@@ -151,9 +151,10 @@
> %endif
> 
> # replace upstream Xsession and Xsetup scripts with the same links from the xinitrc package
>-rm -f %{buildroot}/%{_datadir}/sddm/scripts/{Xsession,Xsetup}
>-ln -sf /%{xinitrc_xdmpath}/Xsession %{buildroot}%{_datadir}/sddm/scripts/Xsession
>-ln -sf /%{xinitrc_xdmpath}/Xsetup_0 %{buildroot}%{_datadir}/sddm/scripts/Xsetup
>+mv -f %{buildroot}/%{_datadir}/sddm/scripts/Xsession %{buildroot}/%{_datadir}/sddm/scripts/Xsession.sddm
>+mv -f %{buildroot}/%{_datadir}/sddm/scripts/Xsetup %{buildroot}/%{_datadir}/sddm/scripts/Xsetup.sddm
>+ln -sf %{xinitrc_xdmpath}/Xsession %{buildroot}%{_datadir}/sddm/scripts/Xsession
>+ln -sf %{xinitrc_xdmpath}/Xsetup_0 %{buildroot}%{_datadir}/sddm/scripts/Xsetup
> 
> # install default sddm.conf
> install -Dpm 644 %{_sourcedir}/sddm.conf %{buildroot}%{_sysconfdir}/

Index: sddm.spec
===================================================================
--- sddm.spec	(revision 1063430)
+++ sddm.spec	(working copy)
@@ -1,4 +1,4 @@
-%define rel 10
+%define rel 11
 
 # this package links to the scripts Xsession and Xsetup from the xinitrc
 # package. Check that these links are always matching each other, across the future
@@ -151,9 +151,10 @@
 %endif
 
 # replace upstream Xsession and Xsetup scripts with the same links from the xinitrc package
-rm -f %{buildroot}/%{_datadir}/sddm/scripts/{Xsession,Xsetup}
-ln -sf /%{xinitrc_xdmpath}/Xsession %{buildroot}%{_datadir}/sddm/scripts/Xsession
-ln -sf /%{xinitrc_xdmpath}/Xsetup_0 %{buildroot}%{_datadir}/sddm/scripts/Xsetup
+mv -f %{buildroot}/%{_datadir}/sddm/scripts/Xsession %{buildroot}/%{_datadir}/sddm/scripts/Xsession.sddm
+mv -f %{buildroot}/%{_datadir}/sddm/scripts/Xsetup %{buildroot}/%{_datadir}/sddm/scripts/Xsetup.sddm
+ln -sf %{xinitrc_xdmpath}/Xsession %{buildroot}%{_datadir}/sddm/scripts/Xsession
+ln -sf %{xinitrc_xdmpath}/Xsetup_0 %{buildroot}%{_datadir}/sddm/scripts/Xsetup
 
 # install default sddm.conf
 install -Dpm 644 %{_sourcedir}/sddm.conf %{buildroot}%{_sysconfdir}/

Actions: View | Diff

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