#
# TODO:
# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
-# - check /etc/pam.d/gdm-autologin
+# - check all /etc/pam.d/gdm-* to be pldized:
+# gdm[1] gdm-autologin[4] gdm-fingerprint[11] gdm-password[1] gdm-smartcard gdm-welcome
#
-# Conditiional build:
+# Conditional build:
%bcond_without selinux # without selinux
+%bcond_without systemd # by default use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
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.1.1
-Release: 9
+Version: 3.4.1
+Release: 3
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: df3f38061066f5e0816676b4eef7854a
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: fda0470340f9c0bc2f8daccb280af520
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
Source5: %{name}-custom.desktop
Source6: %{name}-default.desktop
Source7: %{name}.upstart
-Source8: %{name}.service
Source9: %{name}.tmpfiles
+Source10: %{name}-fingerprint.pamd
Patch0: %{name}-xdmcp.patch
Patch1: %{name}-polkit.patch
Patch2: %{name}-xsession.patch
Patch3: %{name}-defaults.patch
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: polkit-devel >= 0.93
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.627
-BuildRequires: scrollkeeper >= 0.1.4
+%{?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(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: gdm-wm >= 3.2.1
-Requires: gnome-session >= 2.91.91.1
-Requires: gnome-settings-daemon >= 2.91.91
+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: which
+Requires: xinitrc-ng >= 1.0
Requires: xorg-app-sessreg
Requires: xorg-app-xmodmap
+Suggests: ConsoleKit-x11 >= 0.4.1
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
Summary(pl.UTF-8): Skrypt init dla GDM-a
Group: X11/Applications
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: open
Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
%description init
Init script for GDM.
%description upstart -l pl.UTF-8
Opis zadania Upstart dla GDM.
-%package systemd
-Summary: systemd unit for GDM
-Group: Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: accountsservice-systemd
-Requires: systemd-units >= 37-0.10
-
-%description systemd
-systemd unit for GDM
-
%prep
%setup -q
%patch0 -p1
--disable-console-helper \
--disable-scrollkeeper \
--disable-silent-rules \
+ %{__with_without systemd systemd} \
--with-console-kit \
--enable-authentication-scheme=pam \
--with-pam-prefix=/etc \
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,%{systemdunitdir}} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $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 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint
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}
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
-install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+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
%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
-
%postun
-%scrollkeeper_update_postun
%update_icon_cache hicolor
-
if [ "$1" = "0" ]; then
%glib_compile_schemas
%userremove xdm
%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
/sbin/chkconfig --add gdm
# -n skips restarting as it would otherise terminate all sessions opened from gdm!
%service -n gdm restart
+%systemd_reload
+
+%postun init
+%systemd_reload
%preun init
if [ "$1" = "0" ]; then
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%post systemd
-NORESTART=1
-%systemd_post gdm.service
-
-%preun systemd
-%systemd_preun gdm.service
-
-%postun systemd
-%systemd_reload
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%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
%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
-/usr/lib/tmpfiles.d/%{name}.conf
+%{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)
%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/gdm.service
projects / packages / gdm.git / blobdiff