pool/gdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 819952 from GNOME:Factory

Browse Source 
- Fixes for %_libexecdir changing to /usr/libexec (forwarded request 819161 from gmbr3)

OBS-URL: https://build.opensuse.org/request/show/819952
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=230
This commit is contained in:
Dominique Leuenberger 2020-07-13 07:05:33 +00:00 committed by Git OBS Bridge
commit ff7b938ec0
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 7 09:13:05 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 26 00:36:52 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com> Tue May 26 00:36:52 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>

29
gdm.spec
View File

@ -284,11 +284,12 @@ mv %{buildroot}%{_sysconfdir}/gdm/PostLogin/Default.sample %{buildroot}%{_syscon
# Move gdmflexiserver to libexecdir and replace it with the compatibility wrapper # Move gdmflexiserver to libexecdir and replace it with the compatibility wrapper
mv %{buildroot}%{_bindir}/gdmflexiserver %{buildroot}%{_libexecdir}/gdm/gdmflexiserver mv %{buildroot}%{_bindir}/gdmflexiserver %{buildroot}%{_libexecdir}/gdm/gdmflexiserver
install -m 755 %{SOURCE6} %{buildroot}%{_bindir}/gdmflexiserver install -m 755 %{SOURCE6} %{buildroot}%{_bindir}/gdmflexiserver
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{buildroot}%{_bindir}/gdmflexiserver
#Install /etc/xinit.d/xdm integration script #Install /etc/xinit.d/xdm integration script
install -D -m 644 %{SOURCE7} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm install -D -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/X11/displaymanagers/gdm
mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_prefix}/lib/X11/displaymanagers/default-displaymanager
# Install other files # Install other files
mkdir -p %{buildroot}/run/gdm mkdir -p %{buildroot}/run/gdm
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
@ -297,8 +298,8 @@ ln -s ../sbin/gdm %{buildroot}%{_bindir}/gdm
mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 644 %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/gdm.conf install -m 644 %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/gdm.conf
mkdir -p %{buildroot}%{_libexecdir}/systemd/logind.conf.d mkdir -p %{buildroot}%{_prefix}/lib/systemd/logind.conf.d
install -m 644 %{SOURCE10} %{buildroot}%{_libexecdir}/systemd/logind.conf.d/reserveVT.conf install -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/systemd/logind.conf.d/reserveVT.conf
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
%fdupes -s %{buildroot}%{_datadir}/help %fdupes -s %{buildroot}%{_datadir}/help
@ -314,16 +315,16 @@ install -m 644 %{SOURCE10} %{buildroot}%{_libexecdir}/systemd/logind.conf.d/rese
%post %post
%tmpfiles_create gdm.conf %tmpfiles_create gdm.conf
%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \ %{_sbindir}/update-alternatives --install %{_prefix}/lib/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm 25 default-displaymanager %{_prefix}/lib/X11/displaymanagers/gdm 25
%posttrans %posttrans
# Create dconf database for gdm, to lockdown the gdm session # Create dconf database for gdm, to lockdown the gdm session
dconf update dconf update
%postun %postun
[ -f %{_libexecdir}/X11/displaymanagers/gdm ] || %{_sbindir}/update-alternatives \ [ -f %{_prefix}/lib/X11/displaymanagers/gdm ] || %{_sbindir}/update-alternatives \
--remove default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm --remove default-displaymanager %{_prefix}/lib/X11/displaymanagers/gdm
%post -n libgdm1 -p /sbin/ldconfig %post -n libgdm1 -p /sbin/ldconfig
%postun -n libgdm1 -p /sbin/ldconfig %postun -n libgdm1 -p /sbin/ldconfig
@ -361,14 +362,14 @@ dconf update
%config %{_sysconfdir}/pam.d/gdm-launch-environment %config %{_sysconfdir}/pam.d/gdm-launch-environment
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
# /etc/xinit.d/xdm integration # /etc/xinit.d/xdm integration
%dir %{_libexecdir}/X11/displaymanagers %dir %{_prefix}/lib/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/default-displaymanager %{_prefix}/lib/X11/displaymanagers/default-displaymanager
%{_libexecdir}/X11/displaymanagers/gdm %{_prefix}/lib/X11/displaymanagers/gdm
%ghost %{_sysconfdir}/alternatives/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager
%{_udevrulesdir}/61-gdm.rules %{_udevrulesdir}/61-gdm.rules
%{_libexecdir}/tmpfiles.d/gdm.conf %{_prefix}/lib/tmpfiles.d/gdm.conf
%dir %{_libexecdir}/systemd/logind.conf.d %dir %{_prefix}/lib/systemd/logind.conf.d
%{_libexecdir}/systemd/logind.conf.d/reserveVT.conf %{_prefix}/lib/systemd/logind.conf.d/reserveVT.conf
%files -n libgdm1 %files -n libgdm1
%{_libdir}/libgdm.so.* %{_libdir}/libgdm.so.*

4
gdmflexiserver-wrapper
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
if test ! -x "${GDMFLEXISERVER:-/usr/lib/gdm/gdmflexiserver}"; then if test ! -x "${GDMFLEXISERVER:-@LIBEXECDIR@/gdm/gdmflexiserver}"; then
echo "No gdmflexiserver implementation found. Maybe install gdm?" >&2 echo "No gdmflexiserver implementation found. Maybe install gdm?" >&2
exit 1 exit 1
else else
exec "${GDMFLEXISERVER:-/usr/lib/gdm/gdmflexiserver}" exec "${GDMFLEXISERVER:-@LIBEXECDIR@/gdm/gdmflexiserver}"
fi fi