SHA256
1
0
forked from pool/gdm

Accepting request 533836 from GNOME:Factory

Resubmit, with bug ref added (forwarded request 533707 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/533836
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=198
This commit is contained in:
Dominique Leuenberger 2017-10-20 12:41:14 +00:00 committed by Git OBS Bridge
commit eee7ce7ca1
2 changed files with 19 additions and 4 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Oct 12 08:55:56 UTC 2017 - dimstar@opensuse.org
- Have update-alternatives handle Xinit's integration of the
displaymanager, replacing /etc/sysconfig/displaymanager
(boo#1053863).
- Drop usage of glib2_gsettings_schema_* and icon_theme_cache_*
scriptlets, since this is handled by file triggers now.
-------------------------------------------------------------------
Wed Oct 4 16:30:20 UTC 2017 - dimstar@opensuse.org

View File

@ -272,6 +272,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gd
install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver
#Install /etc/xinit.d/xdm integration script
install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
# Install other files
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm
mkdir -p $RPM_BUILD_ROOT/run/gdm
@ -311,16 +315,16 @@ if test -f /sbin/conf.d/SuSEconfig.gdm; then
fi
%post
%glib2_gsettings_schema_post
%icon_theme_cache_post
%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm 25
%posttrans
# Create dconf database for gdm, to lockdown the gdm session
dconf update
%postun
%glib2_gsettings_schema_postun
%icon_theme_cache_postun
[ -f %{_libexecdir}/X11/displaymanagers/gdm ] || %{_sbindir}/update-alternatives \
--remove default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm
%post -n libgdm1 -p /sbin/ldconfig
@ -362,7 +366,9 @@ dconf update
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
# /etc/xinit.d/xdm integration
%dir %{_libexecdir}/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/default-displaymanager
%{_libexecdir}/X11/displaymanagers/gdm
%ghost %{_sysconfdir}/alternatives/default-displaymanager
%files -n libgdm1
%defattr(-,root,root)