From 7235fd11ac29c73bf3a7e9266bca6398ebadf52c Mon Sep 17 00:00:00 2001 From: byeX012 Date: Wed, 27 Nov 2019 14:20:07 +0800 Subject: [PATCH 1/2] gdm: shorten post script --- gdm.spec | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/gdm.spec b/gdm.spec index 2c39e00..5045c3b 100644 --- a/gdm.spec +++ b/gdm.spec @@ -97,7 +97,7 @@ install -p -m644 -D %{SOURCE2} %{buildroot}%{_localstatedir}/lib/gdm/.config/pul exit 0 %post -custom=/etc/gdm/custom.conf +newconffile=/etc/gdm/custom.conf if [ $1 -ge 2 ] ; then if [ -f /usr/share/gdm/config/gdm.conf-custom ]; then @@ -106,35 +106,10 @@ if [ $1 -ge 2 ] ; then oldconffile=/etc/X11/gdm/gdm.conf fi - [ -n "$oldconffile" ] && sed \ - -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' \ - -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' \ - -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' \ - -e 's@^BaseXsession=/etc/X11/gdm/Xsession@#&@' \ - -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' \ - -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' \ - -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' \ - -e 's@^GraphicalTheme=Bluecurve@#&@' \ - -e 's@^BackgroundColor=#20305a@#&@' \ - -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' \ - -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' \ - -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' \ - -e 's@^LogDir=/var/log/gdm@#&@' \ - -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' \ - -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' \ - -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' \ - -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' \ - -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' \ - -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' \ - -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' \ - -e 's@^ServAuthDir=/var/gdm@#&@' \ - -e 's@^Greeter=/usr/bin/gdmlogin@Greeter=/usr/libexec/gdmlogin@' \ - -e 's@^RemoteGreeter=/usr/bin/gdmgreeter@RemoteGreeter=/usr/libexec/gdmgreeter@' \ - $oldconffile > $custom -fi - -if [ $1 -ge 2 -a -f $custom ] && grep -q /etc/X11/gdm $custom ; then - sed -i -e 's@/etc/X11/gdm@/etc/gdm@g' $custom + if [ -n "$oldconffile" ]; then + sed -e 's@^Greeter=/usr/bin/gdmlogin@Greeter=/usr/libexec/gdmlogin@' $oldconffile > $newconffile + sed -e 's@^RemoteGreeter=/usr/bin/gdmgreeter@RemoteGreeter=/usr/libexec/gdmgreeter@' $oldconffile >> $newconffile + fi fi %systemd_post gdm.service From d3e19166d10180f5a91b17e702d76deafa7c73d5 Mon Sep 17 00:00:00 2001 From: byeX012 Date: Thu, 28 Nov 2019 10:57:55 +0800 Subject: [PATCH 2/2] gdm: add provides --- gdm.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdm.spec b/gdm.spec index 5045c3b..18e6029 100644 --- a/gdm.spec +++ b/gdm.spec @@ -52,7 +52,10 @@ user-switching, so multiple users can be logged in at the same time. %package devel Summary: Development files for gdm Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: gdm-pam-extensions-devel = %{epoch}:%{version}-%{release} +Provides: gdm-pam-extensions-devel%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: gdm-pam-extensions-devel < 1:3.30.1-3 +Obsoletes: gdm-pam-extensions-devel%{?_isa} < 1:3.30.1-3 %description devel The gdm-devel package contains header files and others for building