Attachment 8591 Details for Bug 19601 – move the symlinks to the %install section and add %pretrans

[patch] move the symlinks to the %install section and add %pretrans

sddm-withpretrans.diff (text/plain), 1.83 KB, created by Giuseppe Ghibò on 2016-10-24 01:41:21 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2016-10-24 01:41:21 CEST

Size: 1.83 KB

patch

obsolete

>Index: sddm.spec
>===================================================================
>--- sddm.spec	(revision 1063332)
>+++ sddm.spec	(working copy)
>@@ -1,5 +1,12 @@
>-%define rel 9
>+%define rel 10
> 
>+# 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
>+# versions, should their path change.
>+# 
>+%define xinitrc_xdmpath %{_datadir}/X11/xdm
>+
>+
> Name:		sddm
> Version:	0.14.0
> Release:	%mkrel %rel
>@@ -79,10 +86,6 @@
> # instead, a separate Mageia theme is created further below and used by default
> # sed -i -e 's,\(^background=\).*,\1%{_datadir}/mga/backgrounds/default.jpg,' data/themes/*/theme.conf
> 
>-# replace upstream Xsession and Xsetup scripts with the same links from the xinitrc package.
>-rm -f data/scripts/{Xsession,Xsetup}
>-ln -sf /usr/share/X11/xdm/Xsession data/scripts/Xsession
>-ln -sf /usr/share/X11/xdm/Xsetup_0 data/scripts/Xsetup
> 
> %build
> # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not
>@@ -147,6 +150,11 @@
> ####
> %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
>+
> # install default sddm.conf
> install -Dpm 644 %{_sourcedir}/sddm.conf %{buildroot}%{_sysconfdir}/
> 
>@@ -164,6 +172,15 @@
> %_preun_service sddm
> %endif
> 
>+%pretrans
>+if [ ! -L %{_datadir}/sddm/scripts/Xsetup ]; then
>+	%{__rm} -f %{_datadir}/sddm/scripts/Xsetup
>+fi
>+
>+if [ ! -L %{_datadir}/sddm/scripts/XSession ]; then
>+	%{__rm} -f %{_datadir}/sddm/scripts/Xsession
>+fi
>+
> %files
> %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/
> %config(noreplace) %{_sysconfdir}/sddm.conf

Index: sddm.spec
===================================================================
--- sddm.spec	(revision 1063332)
+++ sddm.spec	(working copy)
@@ -1,5 +1,12 @@
-%define rel 9
+%define rel 10
 
+# 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
+# versions, should their path change.
+# 
+%define xinitrc_xdmpath %{_datadir}/X11/xdm
+
+
 Name:		sddm
 Version:	0.14.0
 Release:	%mkrel %rel
@@ -79,10 +86,6 @@
 # instead, a separate Mageia theme is created further below and used by default
 # sed -i -e 's,\(^background=\).*,\1%{_datadir}/mga/backgrounds/default.jpg,' data/themes/*/theme.conf
 
-# replace upstream Xsession and Xsetup scripts with the same links from the xinitrc package.
-rm -f data/scripts/{Xsession,Xsetup}
-ln -sf /usr/share/X11/xdm/Xsession data/scripts/Xsession
-ln -sf /usr/share/X11/xdm/Xsetup_0 data/scripts/Xsetup
 
 %build
 # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not
@@ -147,6 +150,11 @@
 ####
 %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
+
 # install default sddm.conf
 install -Dpm 644 %{_sourcedir}/sddm.conf %{buildroot}%{_sysconfdir}/
 
@@ -164,6 +172,15 @@
 %_preun_service sddm
 %endif
 
+%pretrans
+if [ ! -L %{_datadir}/sddm/scripts/Xsetup ]; then
+	%{__rm} -f %{_datadir}/sddm/scripts/Xsetup
+fi
+
+if [ ! -L %{_datadir}/sddm/scripts/XSession ]; then
+	%{__rm} -f %{_datadir}/sddm/scripts/Xsession
+fi
+
 %files
 %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/
 %config(noreplace) %{_sysconfdir}/sddm.conf

Actions: View | Diff

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