#
+# BIG FAT WARNING!
+#
+# Merged to HEAD with RM's permission. If you need GDM 2.20,
+# create a separate spec for your personal use (like gdm-220.spec)
+#
# TODO:
# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# - check /etc/pam.d/gdm-autologin
-# - ConsoleKit support
#
# Conditiional build:
%bcond_without selinux # without selinux
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
-Version: 2.18.3
-Release: 2
-Epoch: 1
+Version: 2.28.2
+Release: 1
+Epoch: 2
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 08555fce34d247062625c1a451a4d5a6
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5: 9607c6bac31c9d8bd3446e66a4576c2e
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
-# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
-Source4: %{name}-storky.tar.gz
-# Source4-md5: e293fbe4a60004056f6894463b874ae8
-Source5: %{name}-autologin.pamd
+#Source4: %{name}-autologin.pamd
+Source5: %{name}-custom.desktop
+Source6: %{name}-default.desktop
Patch0: %{name}-xdmcp.patch
-Patch1: %{name}-conf.patch
+Patch1: %{name}-polkit.patch
Patch2: %{name}-xsession.patch
-Patch3: %{name}-logdir.patch
-Patch4: %{name}-desktop.patch
-Patch5: %{name}-xorg.patch
-Patch6: %{name}-sessreg.patch
-URL: http://www.jirka.org/gdm.html
+Patch4: %{name}-defaults.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=597050
+Patch5: %{name}-dont-hardcode-path.patch
+URL: http://www.gnome.org/projects/gdm/
+BuildRequires: ConsoleKit-devel >= 0.4.1
+BuildRequires: GConf2-devel >= 2.24.0
BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.73
+BuildRequires: audit-libs-devel
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.9
+BuildRequires: check >= 0.9.4
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.10.10
-BuildRequires: intltool >= 0.35.5
-BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
-BuildRequires: libgsf-devel >= 1.14.2
-BuildRequires: librsvg-devel >= 1:2.16.1
+BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gnome-doc-utils
+BuildRequires: gnome-panel-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: intltool >= 0.40.0
+BuildRequires: iso-codes
+BuildRequires: libcanberra-gtk-devel >= 0.4
+BuildRequires: libglade2-devel >= 1:2.6.2
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.27
+BuildRequires: libxklavier-devel >= 4.0-2
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: pkgconfig
+BuildRequires: polkit-gnome-devel >= 0.92
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libdmx-devel
+Requires(post,preun): GConf2
+Requires(post,postun): /usr/bin/scrollkeeper-update
Requires(post,postun): gtk+2
Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): /usr/bin/scrollkeeper-update
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: libgnomeui >= 2.18.1
+Requires: /usr/bin/X
+Requires: gnome-session >= 2.24.0
+Requires: gnome-settings-daemon >= 2.24.0
Requires: pam >= 0.99.7.1
+Requires: polkit-gnome >= 0.92
Requires: which
Requires: xorg-app-sessreg
+Requires: xorg-app-xmodmap
+Suggests: zenity
+Provides: XDM
Provides: group(xdm)
Provides: user(xdm)
-Obsoletes: X11-xdm
+Obsoletes: gdm-Xnest
Conflicts: gdkxft
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _localstatedir /var/lib
-
%description
Gdm (the GNOME Display Manager) is a highly configurable
reimplementation of xdm, the X Display Manager. Gdm allows you to log
Manager). GDM дозволяє вам входити в систему, на якій запущено X
Window та підтримує роботу кількох різних X сеансів одночасно.
-%package Xnest
-Summary: Xnest (ie embedded X) server for GDM
-Summary(pl.UTF-8): Serwer Xnest dla GDM
-Group: X11/Applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: xorg-xserver-Xnest
-
-%description Xnest
-This package add support for Xnest server in gdm.
-
-%description Xnest -l pl.UTF-8
-Ten pakiet dodaje do gdm wsparcie dla Xnest.
-
%package init
Summary: Init script for GDM
Summary(pl.UTF-8): Skrypt init dla GDM-a
%description init -l pl.UTF-8
Skrypt init dla GDM-a.
+%package user-switch-applet
+Summary: GNOME applet for fast user switching
+Summary(pl.UTF-8): Aplet GNOME do szybkiego przełączania użytkowników
+Group: X11/Applications
+Requires: gdm >= 2:2.22.0
+Provides: gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-applet-fast-user-switch
+
+%description user-switch-applet
+The GDM User Switch Applet is an applet for the GNOME panel which
+provides a mechanism for switching between users.
+
+%description user-switch-applet -l pl.UTF-8
+GDM User Switch Applet to aplet panelu GNOME udostępniający mechanizm
+do przełączania między użytkownikami.
+
%prep
-%setup -q -a4
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
+rm -f data/gdm.schemas.in
%build
%{__libtoolize}
%{__glib_gettextize}
%{__intltoolize}
%{__aclocal}
+%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
--disable-console-helper \
--disable-scrollkeeper \
+ --with-console-kit \
--enable-authentication-scheme=pam \
--with-pam-prefix=/etc \
--with-tcp-wrappers=yes \
--with%{!?with_selinux:out}-selinux \
--with-xdmcp=yes \
- --with-xinerama=yes
+ --with-xinerama=yes \
+ --with-user=xdm \
+ --with-group=xdm
%{__make}
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
- $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky
+ $RPM_BUILD_ROOT%{_datadir}/xsessions
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
PAM_PREFIX=/etc
-mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop \
- $RPM_BUILD_ROOT%{_datadir}/xsessions
-
install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
+#install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
-
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
-%find_lang %{name} --all-name --with-gnome
-
-# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+%find_lang %{name} --with-gnome --with-omf --all-name
-# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+# allow executing ~/.Xclients and ~/.xsession
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
%post
+%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
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gdm-dmx-reconnect-proxy
-%attr(755,root,root) %{_bindir}/gdmdynamic
-%attr(755,root,root) %{_bindir}/gdmflexiserver
-%attr(755,root,root) %{_bindir}/gdmphotosetup
-%attr(755,root,root) %{_bindir}/gdmthemetester
-%attr(755,root,root) %{_libdir}/gdmaskpass
-%attr(755,root,root) %{_libdir}/gdmopen
-%attr(755,root,root) %{_libdir}/gdmtranslate
-%attr(755,root,root) %{_libdir}/gdmchooser
-%attr(755,root,root) %{_libdir}/gdmgreeter
-%attr(755,root,root) %{_libdir}/gdmlogin
+%attr(755,root,root) %{_libexecdir}/gdm-crash-logger
+%attr(755,root,root) %{_libexecdir}/gdm-factory-slave
+%attr(755,root,root) %{_libexecdir}/gdm-host-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-product-slave
+%attr(755,root,root) %{_libexecdir}/gdm-session-worker
+%attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
+%attr(755,root,root) %{_libexecdir}/gdm-simple-slave
+%attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/*
%dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/modules
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init
+%dir %{_sysconfdir}/gdm/Init
+%attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
%attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession
%attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
%attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
+%dir %{_sysconfdir}/gdm/PostLogin
%config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%config %{_sysconfdir}/gdm/locale.alias
-%config %{_sysconfdir}/gdm/modules/*
-
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
-
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
+%{_sysconfdir}/gdm/gdm.schemas
+%{_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(750,xdm,xdm) /var/lib/gdm
+%attr(1755,root,xdm) /var/cache/gdm
+%attr(1770,root,xdm) %dir /var/lib/gdm
+%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(750,xdm,xdm) /var/log/gdm
+%attr(1777,root,xdm) /var/run/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
-%{_desktopdir}/gdmsetup.desktop
-%{_desktopdir}/gdmflexiserver.desktop
-%{_desktopdir}/gdmphotosetup.desktop
%{_datadir}/gdm
-#%%{_datadir}/xsessions - moved to gnome-session
+%{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/xsessions/custom.desktop
%{_datadir}/xsessions/default.desktop
%{_iconsdir}/hicolor/*/apps/*.png
-%{_omf_dest_dir}/gdm
-%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
-%{_mandir}/man1/gdm*
-
-%files Xnest
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdmXnest
-%attr(755,root,root) %{_bindir}/gdmXnestchooser
-%{_desktopdir}/gdmflexiserver-xnest.desktop
%files init
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/gdm
+
+%files user-switch-applet
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
+%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
projects / packages / gdm.git / blobdiff