# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# - check /etc/pam.d/gdm-autologin
#
-# Conditiional build:
+# Conditional build:
%bcond_without selinux # without selinux
+%bcond_without systemd # rely on systemd for session tracking instead of ConsoleKit
Summary: GNOME Display Manager
Summary(es.UTF-8): Administrador de Entrada del GNOME
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
-Version: 3.2.0
-Release: 4
+Version: 3.4.0.1
+Release: 2
Epoch: 2
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: 34819420a3177fe18eac2154762ed996
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 7dedcccb5fee6f63224f5674920ef4af
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
Source5: %{name}-custom.desktop
Source6: %{name}-default.desktop
Source7: %{name}.upstart
+Source9: %{name}.tmpfiles
Patch0: %{name}-xdmcp.patch
Patch1: %{name}-polkit.patch
Patch2: %{name}-xsession.patch
Patch3: %{name}-defaults.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=660409
Patch4: shell-check.patch
URL: http://www.gnome.org/projects/gdm/
-BuildRequires: GConf2-devel >= 2.32.0
BuildRequires: accountsservice-devel >= 0.6.12
BuildRequires: attr-devel
BuildRequires: audit-libs-devel
BuildRequires: docbook-dtd412-xml
BuildRequires: fontconfig-devel >= 2.5.0
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: glib2-devel >= 1:2.30.0
BuildRequires: gnome-doc-utils
BuildRequires: gtk+3-devel >= 3.0.0
BuildRequires: intltool >= 0.40.0
BuildRequires: libtool
BuildRequires: libwrap-devel
BuildRequires: libxklavier-devel >= 4.0-2
+BuildRequires: nss-devel >= 3.11.1
BuildRequires: pam-devel
BuildRequires: pango-devel >= 1.3.0
BuildRequires: perl-modules
BuildRequires: pkgconfig
+BuildRequires: polkit-devel >= 0.93
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.450
-BuildRequires: scrollkeeper >= 0.1.4
+BuildRequires: rpmbuild(macros) >= 1.627
+%{?with_systemd:BuildRequires: systemd-devel}
BuildRequires: tar >= 1:1.22
BuildRequires: upower-devel >= 0.9.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: xz
-Requires(post,postun): /usr/bin/scrollkeeper-update
+Requires(post,postun): glib2 >= 1:2.26.0
Requires(post,postun): gtk-update-icon-cache
-Requires(post,preun): GConf2
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
+Requires(posttrans): dconf
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: /usr/bin/X
Requires: ConsoleKit-x11 >= 0.4.1
Requires: accountsservice >= 0.6.12
Requires: dbus-x11
-Requires: gnome-session >= 2.91.91.1
-Requires: gnome-settings-daemon >= 2.91.91
+Requires: gdm-wm >= 3.2.1
+Requires: gnome-session >= 3.0.0
+Requires: gnome-settings-daemon >= 3.0.0
Requires: hicolor-icon-theme
Requires: pam >= 0.99.7.1
Requires: polkit-gnome >= 0.93
+Requires: systemd-units >= 37-0.10
Requires: which
+Requires: xinitrc-ng >= 1.0
Requires: xorg-app-sessreg
Requires: xorg-app-xmodmap
+Suggests: pam-pam_gnome_keyring
Suggests: zenity
Provides: XDM
Provides: group(xdm)
Provides: user(xdm)
Obsoletes: gdm-Xnest
+Obsoletes: gdm-systemd
Obsoletes: gdm-user-switch-applet
Obsoletes: gnome-applet-fast-user-switch
Conflicts: gdkxft
--disable-console-helper \
--disable-scrollkeeper \
--disable-silent-rules \
+ %{__with_without systemd systemd} \
--with-console-kit \
--enable-authentication-scheme=pam \
--with-pam-prefix=/etc \
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security,init} \
$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
- $RPM_BUILD_ROOT%{_datadir}/xsessions
+ $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{systemdunitdir}} \
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- PAM_PREFIX=/etc
+ PAM_PREFIX=%{_sysconfdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
+install %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -rf $RPM_BUILD_ROOT
+%posttrans
+umask 022
+/usr/bin/dconf update
+
%pre
%groupadd -g 55 -r -f xdm
%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
%post
%glib_compile_schemas
-%gconf_schema_install gdm-simple-greeter.schemas
-%scrollkeeper_update_post
%update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_reload
%postun
-%scrollkeeper_update_postun
%update_icon_cache hicolor
+%systemd_reload
if [ "$1" = "0" ]; then
%glib_compile_schemas
%groupremove xdm
fi
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- %{name} < 2:3.2.1.1-10
if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
fi
%dir %{_sysconfdir}/gdm/PostLogin
%config %{_sysconfdir}/gdm/PostLogin/Default.sample
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
-%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
-%{_sysconfdir}/dconf/db/gdm
+%{_sysconfdir}/dconf/db/gdm.d
%{_sysconfdir}/dconf/profile/gdm
%attr(1755,root,xdm) %dir /var/cache/gdm
%attr(1770,root,xdm) %dir /var/gdm
%attr(1770,root,xdm) %dir /var/lib/gdm
%dir /var/lib/gdm/.config
%attr(755,xdm,xdm) %dir /var/lib/gdm/.config/dconf
-%attr(1750,root,xdm) %dir /var/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) /var/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) /var/lib/gdm/.gconf.path
%attr(755,xdm,xdm) /var/lib/gdm/.local
%attr(750,xdm,xdm) %dir /var/log/gdm
%attr(711,root,xdm) %dir /var/run/gdm
%attr(755,xdm,xdm) %dir /var/run/gdm/greeter
%attr(750,xdm,xdm) /home/services/xdm
+%{systemdtmpfilesdir}/%{name}.conf
%{_pixmapsdir}/*
%{_datadir}/gdm
%{_datadir}/polkit-1/actions/gdm.policy
%files init
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/gdm
+%{systemdunitdir}/gdm.service
%files upstart
%defattr(644,root,root,755)
projects / packages / gdm.git / blobdiff