X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gdm.spec;h=3c4eba36db97cbd659baa7a8964631e4d9e7d825;hb=2bdc954852a417cd543c5aa324a6a19ad93db8f3;hp=079b3e331b31063d8dd6fba08f2dfb8b13faa3b3;hpb=f85eb744dc102897165a07d3fc0f9bdd41477a48;p=packages%2Fgdm.git

diff --git a/gdm.spec b/gdm.spec
index 079b3e3..3c4eba3 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,16 +1,12 @@
 #
-# 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
+# - upstart package
 #
 # Conditiional build:
 %bcond_without	selinux	# without selinux
-#
+
 Summary:	GNOME Display Manager
 Summary(es.UTF-8):	Administrador de Entrada del GNOME
 Summary(ja.UTF-8):	GNOME ディスプレイマネージャ
@@ -19,72 +15,77 @@ Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	2.28.1
-Release:	2
+Version:	3.0.2
+Release:	1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5:	917dc80f5ef6adcdc15193de238476db
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	9a52f9a8ce7451895bb40c4109c3ce10
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
-#Source4:	%{name}-autologin.pamd
+Source4:	%{name}-autologin.pamd
 Source5:	%{name}-custom.desktop
 Source6:	%{name}-default.desktop
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
-Patch4:		%{name}-defaults.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=597050
-Patch5:		%{name}-dont-hardcode-path.patch
+Patch3:		%{name}-defaults.patch
 URL:		http://www.gnome.org/projects/gdm/
-BuildRequires:	ConsoleKit-devel >= 0.4.1
-BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	GConf2-devel >= 2.32.0
+BuildRequires:	accountsservice-devel >= 0.6.5
 BuildRequires:	attr-devel
 BuildRequires:	audit-libs-devel
 BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	check >= 0.9.4
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd412-xml
+BuildRequires:	fontconfig-devel >= 2.5.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	glib2-devel >= 1:2.28.0
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gnome-panel-devel >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gnome-panel-devel >= 2.0.0
+BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes
-BuildRequires:	libcanberra-gtk-devel >= 0.4
-BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libcanberra-gtk3-devel >= 0.4
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
+BuildRequires:	libwrap-devel
 BuildRequires:	libxklavier-devel >= 4.0-2
 BuildRequires:	pam-devel
+BuildRequires:	pango-devel >= 1.3.0
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-gnome-devel >= 0.92
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
+BuildRequires:	scrollkeeper >= 0.1.4
+BuildRequires:	upower-devel >= 0.9.0
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xorg-lib-libXdmcp-devel
+BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libdmx-devel
-Requires(post,preun):	GConf2
+BuildRequires:	xorg-lib-libXrandr-devel
 Requires(post,postun):	/usr/bin/scrollkeeper-update
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
+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:	/usr/bin/Xorg
-Requires:	gnome-session >= 2.24.0
-Requires:	gnome-settings-daemon >= 2.24.0
+Requires:	/usr/bin/X
+Requires:	ConsoleKit >= 0.4.1
+Requires:	accountsservice >= 0.6.5
+Requires:	gnome-session >= 2.91.91.1
+Requires:	gnome-settings-daemon >= 2.91.91
+Requires:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
-Requires:	polkit-gnome >= 0.92
+Requires:	polkit-gnome >= 0.93
 Requires:	which
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
@@ -93,6 +94,8 @@ Provides:	XDM
 Provides:	group(xdm)
 Provides:	user(xdm)
 Obsoletes:	gdm-Xnest
+Obsoletes:	gdm-user-switch-applet
+Obsoletes:	gnome-applet-fast-user-switch
 Conflicts:	gdkxft
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
@@ -108,9 +111,8 @@ several different X sessions on your local machine at the same time.
 Administrador de Entrada del GNOME.
 
 %description -l ja.UTF-8
-Gdm (the GNOME Display Manager) は、高度に設定可能な xdm X Display
-Manager の再実装版です。 Gdm を使うと、 X Window System
-が動いているあなたの
+Gdm (the GNOME Display Manager) は、高度に設定可能な xdm X Display Manager
+の再実装版です。 Gdm を使うと、 X Window System が動いているあなたの
 システムにいろいろなセッションを選択してログインすることができます。
 
 このバージョンの Gdm では、各種言語や、XIM を選択することも可能です。
@@ -140,6 +142,7 @@ Group:		X11/Applications
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	open
+Requires:	rc-scripts >= 0.4.3.0
 
 %description init
 Init script for GDM.
@@ -147,32 +150,15 @@ Init script for GDM.
 %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
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch4 -p1
-%patch5 -p1
-rm -f data/gdm.schemas.in
+%patch3 -p1
 
 %build
+touch data/gdm.schemas.in.in
 %{__libtoolize}
 %{__glib_gettextize}
 %{__intltoolize}
@@ -183,6 +169,7 @@ rm -f data/gdm.schemas.in
 %configure \
 	--disable-console-helper \
 	--disable-scrollkeeper \
+	--disable-silent-rules \
 	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
@@ -206,11 +193,9 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 	PAM_PREFIX=/etc
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
-#install %{SOURCE4} $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}
-
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -266,6 +251,10 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_sbindir}/gdm
+%attr(755,root,root) %{_sbindir}/gdm-binary
+%attr(755,root,root) %{_bindir}/gdm-screenshot
+%attr(755,root,root) %{_bindir}/gdmflexiserver
 %attr(755,root,root) %{_libexecdir}/gdm-crash-logger
 %attr(755,root,root) %{_libexecdir}/gdm-factory-slave
 %attr(755,root,root) %{_libexecdir}/gdm-host-chooser
@@ -275,8 +264,6 @@ fi
 %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/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
@@ -286,23 +273,28 @@ 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}/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(1770,root,xdm) %{_localstatedir}/gdm
-%attr(1755,root,xdm) %{_localstatedir}/cache/gdm
-%attr(1770,root,xdm) %dir %{_localstatedir}/lib/gdm
-%attr(1750,root,xdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
-%attr(1777,root,xdm) %{_localstatedir}/run/gdm
+%{_sysconfdir}/dconf/db/gdm
+%{_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(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
 %{_pixmapsdir}/*
 %{_datadir}/gdm
 %{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/gnome-session/sessions/gdm.session
 %{_datadir}/xsessions/custom.desktop
 %{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
@@ -310,9 +302,3 @@ fi
 %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