X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gdm.spec;h=7c214f2a038f04c1a85316d0d2dba259a80d5047;hb=3488434f6dccae822f9122ee15882faa0b02fa05;hp=104c831e37093edd46a5afe6ecfaa62e08e91870;hpb=18cf80f6713bd109183335d4cef67323a557f490;p=packages%2Fgdm.git

diff --git a/gdm.spec b/gdm.spec
index 104c831..7c214f2 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,26 +1,26 @@
 #
 # 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.2
+Version:	2.20.7
 Release:	2
-Epoch:		1
+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:	3a5d77c6cc59fb1eecf898abcbb7eb25
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5:	15be72743003cb1e36c9ce2ac2de5381
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -31,32 +31,36 @@ Source5:	%{name}-autologin.pamd
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-conf.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
+Patch3:		%{name}-desktop.patch
+Patch4:		%{name}-defaults.patch
+URL:		http://www.gnome.org/projects/gdm/
+BuildRequires:	ConsoleKit-devel
 BuildRequires:	attr-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.6
-BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.16.1
-BuildRequires:	libgsf-devel >= 1.14.2
-BuildRequires:	librsvg-devel >= 1:2.16.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	intltool >= 0.36.1
+BuildRequires:	libart_lgpl-devel >= 2.3.19
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeui-devel >= 2.20.0
+BuildRequires:	libgsf-devel >= 1.14.6
+BuildRequires:	librsvg-devel >= 1:2.18.1
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.26
+BuildRequires:	libxml2-devel >= 1:2.6.29
 BuildRequires:	pam-devel
 BuildRequires:	perl-modules
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	scrollkeeper
+BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXdmcp-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libdmx-devel
-Requires(post,postun):	gtk+2 >= 2:2.10.6
+Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires(postun):	/usr/sbin/groupdel
@@ -64,18 +68,17 @@ Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	libgnomeui >= 2.16.1
-Requires:	pam >= 0.79.0
+Requires:	libgnomeui >= 2.20.0
+Requires:	pam >= 0.99.7.1
 Requires:	which
+Requires:	xorg-app-xmodmap
 Requires:	xorg-app-sessreg
+Provides:	XDM
 Provides:	group(xdm)
 Provides:	user(xdm)
-Obsoletes:	X11-xdm
-Obsoletes:	entrance
-Obsoletes:	kdm
-Obsoletes:	wdm
-Obsoletes:	xdm
 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
@@ -86,38 +89,38 @@ 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 ru.UTF-8
+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 ÓÅÁÎÓ¦× ÏÄÎÏÞÁÓÎÏ.
+%description -l uk.UTF-8
+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
+Summary(pl.UTF-8):	Serwer Xnest dla GDM
 Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	xorg-xserver-Xnest
@@ -125,12 +128,12 @@ Requires:	xorg-xserver-Xnest
 %description Xnest
 This package add support for Xnest server in gdm.
 
-%description Xnest -l pl
+%description Xnest -l pl.UTF-8
 Ten pakiet dodaje do gdm wsparcie dla Xnest.
 
 %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}
@@ -139,7 +142,7 @@ Requires:	open
 %description init
 Init script for GDM.
 
-%description init -l pl
+%description init -l pl.UTF-8
 Skrypt init dla GDM-a.
 
 %prep
@@ -149,8 +152,9 @@ Skrypt init dla GDM-a.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__libtoolize}
@@ -162,6 +166,7 @@ Skrypt init dla GDM-a.
 %configure \
 	--disable-console-helper \
 	--disable-scrollkeeper \
+	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
 	--with-tcp-wrappers=yes \
@@ -194,7 +199,7 @@ 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}
@@ -216,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+
 if [ "$1" = "0" ]; then
 	%userremove xdm
 	%groupremove xdm
@@ -275,14 +281,11 @@ fi
 %attr(750,xdm,xdm) /var/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
 %{_iconsdir}/hicolor/*/apps/*.png
-%{_omf_dest_dir}/gdm
+%{_iconsdir}/hicolor/*/apps/*.svg
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
 %{_mandir}/man1/gdm*
 
@@ -290,7 +293,6 @@ fi
 %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)