X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdm2.20.git;a=blobdiff_plain;f=gdm.spec;h=b6bc43e9065fc77ee9f59a20b868caf03db8b9ad;hp=5ff3c748d52ff225b2b68353f45222eb28d7cee7;hb=3e1600cdf6d44441b0512cd8f545994a8aaadd8b;hpb=0e62817539a505e62a7acae1896ea9eff653d27c

diff --git a/gdm.spec b/gdm.spec
index 5ff3c74..b6bc43e 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,133 +1,134 @@
 #
+# 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
+# - 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:
 %bcond_without	selinux	# without selinux
 #
 Summary:	GNOME Display Manager
-Summary(es):	Administrador de Entrada del GNOME
-Summary(ja):	GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
-Summary(pl):	gdm - zarz±dca ekranów GNOME
-Summary(pt_BR):	Gerenciador de Entrada do GNOME
-Summary(ru):	äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
-Summary(uk):	äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
+Summary(es.UTF-8):	Administrador de Entrada del GNOME
+Summary(ja.UTF-8):	GNOME ディスプレイマネージャ
+Summary(pl.UTF-8):	gdm - zarządca ekranów GNOME
+Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
+Summary(ru.UTF-8):	Дисплейный менеджер GNOME
+Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	2.16.1
-Release:	1
-Epoch:		1
+Version:	2.28.0
+Release:	6
+Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	a0bf247fdaf32add6d5a69495a433bbf
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	7724929a6b75ba269fd519d4a4995bbb
 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
 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
-URL:		http://www.jirka.org/gdm.html
+Patch4:		%{name}-defaults.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
-BuildRequires:	automake
+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:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.5
-BuildRequires:	intltool >= 0.35
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.16.0
-BuildRequires:	libgsf-devel >= 1.14.2
-BuildRequires:	librsvg-devel >= 1:2.16.0
+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:	libglade2-devel >= 1:2.6.2
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.26
+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
+BuildRequires:	docbook-dtd412-xml
+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.16.0
-Requires:	pam >= 0.79.0
+Requires:	/usr/bin/Xorg
+Requires:	gnome-session >= 2.24.0
+Requires:	gnome-settings-daemon >= 2.24.0
+Requires:	libgnomeui >= 2.24.0
+Requires:	pam >= 0.99.7.1
+Requires:	polkit-gnome >= 0.92
 Requires:	which
 Requires:	xorg-app-sessreg
+Requires:	xorg-app-xmodmap
+Provides:	XDM
 Provides:	group(xdm)
 Provides:	user(xdm)
-Obsoletes:	X11-xdm
-Obsoletes:	entrance
-Obsoletes:	kdm
-Obsoletes:	wdm
-Obsoletes:	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
 into your system with the X Window System running and supports running
 several different X sessions on your local machine at the same time.
 
-%description -l es
+%description -l es.UTF-8
 Administrador de Entrada del GNOME.
 
-%description -l ja
-Gdm (the GNOME Display Manager) ¤Ï¡¢¹âÅÙ¤ËÀßÄê²Äǽ¤Ê xdm X Display
-Manager ¤ÎºÆ¼ÂÁõÈǤǤ¹¡£ Gdm ¤ò»È¤¦¤È¡¢ X Window System
-¤¬Æ°¤¤¤Æ¤¤¤ë¤¢¤Ê¤¿¤Î
-¥·¥¹¥Æ¥à¤Ë¤¤¤í¤¤¤í¤Ê¥»¥Ã¥·¥ç¥ó¤òÁªÂò¤·¤Æ¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+%description -l ja.UTF-8
+Gdm (the GNOME Display Manager) は、高度に設定可能な xdm X Display
+Manager の再実装版です。 Gdm を使うと、 X Window System
+が動いているあなたの
+システムにいろいろなセッションを選択してログインすることができます。
 
-¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Gdm ¤Ç¤Ï¡¢³Æ¼ï¸À¸ì¤ä¡¢XIM ¤òÁªÂò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+このバージョンの Gdm では、各種言語や、XIM を選択することも可能です。
 
-%description -l pl
-Gdm jest wysokokonfigurowaln± reimplementacj± xdma. Gdm pozwala
-logowaæ siê do systemu z poziomu X11 i wspiera jednoczesn± pracê kilku
-ró¿nych sesji X na lokalnej maszynie.
+%description -l pl.UTF-8
+Gdm jest wysokokonfigurowalną reimplementacją xdma. Gdm pozwala
+logować się do systemu z poziomu X11 i wspiera jednoczesną pracę kilku
+różnych sesji X na lokalnej maszynie.
 
-%description -l pt_BR
+%description -l pt_BR.UTF-8
 Gerenciador de Entrada do GNOME.
 
-%description -l ru
-GDM (GNOME Display Manager) - ÜÔÏ ÒÅÉÍÐÌÅÍÅÎÔÁÃÉÑ xdm (X Display
-Manager). GDM ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ×ÈÏÄÉÔØ × ÓÉÓÔÅÍÕ, ÎÁ ËÏÔÏÒÏÊ ÚÁÐÕÝÅÎÏ X
-Window É ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÂÏÔÕ ÎÅÓËÏÌØÕÉÈ ÒÁÚÎÙÈ X ÓÅÁÎÓÏ× ÏÄÎÏ×ÒÅÍÅÎÎÏ.
-
-%description -l uk
-GDM (GNOME Display Manager) - ÃÅ ÒŦÍÐÌÅÍÅÎÔÁÃ¦Ñ xdm (X Display
-Manager). GDM ÄÏÚ×ÏÌѤ ×ÁÍ ×ÈÏÄÉÔÉ × ÓÉÓÔÅÍÕ, ÎÁ ÑË¦Ê ÚÁÐÕÝÅÎÏ X
-Window ÔÁ ЦÄÔÒÉÍÕ¤ ÒÏÂÏÔÕ Ë¦ÌØËÏÈ Ò¦ÚÎÉÈ X ÓÅÁÎÓ¦× ÏÄÎÏÞÁÓÎÏ.
-
-%package Xnest
-Summary:	Xnest (ie embedded X) server for GDM
-Summary(pl):	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 -l ru.UTF-8
+GDM (GNOME Display Manager) - это реимплементация xdm (X Display
+Manager). GDM позволяет вам входить в систему, на которой запущено X
+Window и поддерживает работу нескольуих разных X сеансов одновременно.
 
-%description Xnest -l pl
-Ten pakiet dodaje do gdm wsparcie dla Xnest.
+%description -l uk.UTF-8
+GDM (GNOME Display Manager) - це реімплементація xdm (X Display
+Manager). GDM дозволяє вам входити в систему, на якій запущено X
+Window та підтримує роботу кількох різних X сеансів одночасно.
 
 %package init
 Summary:	Init script for GDM
-Summary(pl):	Skrypt init dla GDM-a
+Summary(pl.UTF-8):	Skrypt init dla GDM-a
 Group:		X11/Applications
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -136,34 +137,37 @@ Requires:	open
 %description init
 Init script for GDM.
 
-%description init -l pl
+%description init -l pl.UTF-8
 Skrypt init dla GDM-a.
 
 %prep
-%setup -q -a4
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -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}
 
@@ -171,26 +175,20 @@ Skrypt init dla GDM-a.
 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
 
 %{__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
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 # Remove useless files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
@@ -206,10 +204,17 @@ 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
+
 if [ "$1" = "0" ]; then
 	%userremove xdm
 	%groupremove xdm
@@ -238,53 +243,43 @@ fi
 %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-user-switch-applet
+%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) %{_sysconfdir}/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(750,xdm,xdm) /var/log/gdm
+%attr(750,xdm,xdm) %{_localstatedir}/gdm
+%attr(750,xdm,xdm) %{_localstatedir}/log/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}/xsessions/default.desktop
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%{_datadir}/polkit-1/actions/gdm.policy
 %{_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
+%{_libdir}/bonobo/servers/*.server
+%{_localstatedir}/lib/gdm
+%attr(750,xdm,xdm) %dir /var/cache/gdm
 
 %files init
 %defattr(644,root,root,755)