X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdm.spec;h=fe85776ee150d79bbb48dfaab1d63679d5bae179;hb=edc42653ac3735f03b71ffdffbf0ab0d08612413;hp=f8d97d5aacd3ff804189bbe96019812f11c3c478;hpb=b2882326014e2b5e26661cd657867814ac59dc7f;p=packages%2Fgdm.git

diff --git a/gdm.spec b/gdm.spec
index f8d97d5..fe85776 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
 #
-# Conditiional build:
+# Conditional build:
 %bcond_without	selinux	# without selinux
-#
+%bcond_without  systemd # rely on systemd for session tracking instead of ConsoleKit
+
 Summary:	GNOME Display Manager
 Summary(es.UTF-8):	Administrador de Entrada del GNOME
 Summary(ja.UTF-8):	GNOME ディスプレイマネージャ
@@ -19,74 +15,99 @@ 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.0
-Release:	7
+Version:	3.4.0.1
+Release:	2
 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:	7724929a6b75ba269fd519d4a4995bbb
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.4/%{name}-%{version}.tar.xz
+# Source0-md5:	7dedcccb5fee6f63224f5674920ef4af
 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
+Source7:	%{name}.upstart
+Source9:	%{name}.tmpfiles
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
-Patch4:		%{name}-defaults.patch
+Patch3:		%{name}-defaults.patch
+Patch4:		shell-check.patch
 URL:		http://www.gnome.org/projects/gdm/
-BuildRequires:	ConsoleKit-devel >= 0.4.1
-BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	accountsservice-devel >= 0.6.12
 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.30.0
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gnome-panel-devel >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libcanberra-gtk-devel >= 0.4
-BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	iso-codes
+BuildRequires:	libcanberra-gtk3-devel >= 0.4
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
+BuildRequires:	libwrap-devel
 BuildRequires:	libxklavier-devel >= 4.0-2
+BuildRequires:	nss-devel >= 3.11.1
 BuildRequires:	pam-devel
+BuildRequires:	pango-devel >= 1.3.0
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-gnome-devel >= 0.92
+BuildRequires:	polkit-devel >= 0.93
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
+BuildRequires:	rpmbuild(macros) >= 1.627
+%{?with_systemd:BuildRequires:  systemd-devel}
+BuildRequires:	tar >= 1:1.22
+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
-BuildRequires:	docbook-dtd412-xml
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	/usr/bin/scrollkeeper-update
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xz
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	gtk-update-icon-cache
 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:	libgnomeui >= 2.24.0
+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 >= 3.0.0
+Requires:	gnome-settings-daemon >= 3.0.0
+Requires:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
-Requires:	polkit-gnome >= 0.92
+Requires:	polkit-gnome >= 0.93
+Requires:	systemd-units >= 37-0.10
 Requires:	which
+Requires:	xinitrc-ng >= 1.0
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
+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
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
@@ -102,9 +123,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 を選択することも可能です。
@@ -127,6 +147,43 @@ GDM (GNOME Display Manager) - це реімплементація xdm (X Display
 Manager). GDM дозволяє вам входити в систему, на якій запущено X
 Window та підтримує роботу кількох різних X сеансів одночасно.
 
+%package libs
+Summary:	GDM libraries
+Summary(pl.UTF-8):	Biblioteki GDM
+Group:		Libraries
+
+%description libs
+GDM libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki GDM.
+
+%package devel
+Summary:	Header files for GDM
+Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja
+Group:		X11/Development/Libraries
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+
+%description devel
+This package contains the files necessary to develop applications
+using GDM's libraries.
+
+%description devel -l pl.UTF-8
+Pakiet zawiera pliki potrzebne do rozwoju aplikacji używających
+bibliotek programu GDM.
+
+%package static
+Summary:	Static libraries for GDM
+Summary(pl.UTF-8):	Biblioteki statyczne dla GDM
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+
+%description static
+This package contains static libraries for GDM.
+
+%description static -l pl.UTF-8
+Pakiet zawiera statyczne biblioteki GDM.
+
 %package init
 Summary:	Init script for GDM
 Summary(pl.UTF-8):	Skrypt init dla GDM-a
@@ -134,6 +191,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.
@@ -141,15 +199,29 @@ Init script for GDM.
 %description init -l pl.UTF-8
 Skrypt init dla GDM-a.
 
+%package upstart
+Summary:	Upstart job description for GDM
+Summary(pl.UTF-8):	Opis zadania Upstart dla GDM
+Group:		Daemons
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for GDM.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla GDM.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
-rm -f data/gdm.schemas.in
 
 %build
+touch data/gdm.schemas.in.in
 %{__libtoolize}
 %{__glib_gettextize}
 %{__intltoolize}
@@ -160,6 +232,8 @@ rm -f data/gdm.schemas.in
 %configure \
 	--disable-console-helper \
 	--disable-scrollkeeper \
+	--disable-silent-rules \
+	%{__with_without systemd systemd} \
 	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
@@ -174,66 +248,70 @@ rm -f data/gdm.schemas.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
+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%{systemdtmpfilesdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	PAM_PREFIX=/etc
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
-#install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
+	PAM_PREFIX=%{_sysconfdir}
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
+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}
+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
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
-# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+# allow executing ~/.Xclients and ~/.xsession
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
-# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdm/simple-greeter/extensions/*.{a,la} \
+    $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%posttrans
+umask 022
+/usr/bin/dconf update
+
 %pre
 %groupadd -g 55 -r -f xdm
 %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
+%glib_compile_schemas
 %update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_reload
 
 %postun
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
+%systemd_reload
 
 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
+	mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
 fi
 
 %post init
 /sbin/chkconfig --add gdm
-if [ -f /var/lock/subsys/gdm ]; then
-	echo "Run \"/sbin/service gdm restart\" to restart gdm." >&2
-	echo "WARNING: it will terminate all sessions opened from gdm!" >&2
-else
-	echo "Run \"/sbin/service gdm start\" to start gdm." >&2
-fi
+# -n skips restarting as it would otherise terminate all sessions opened from gdm!
+%service -n gdm restart
 
 %preun init
 if [ "$1" = "0" ]; then
@@ -241,9 +319,22 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del gdm
 fi
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %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
+%dir %{_libdir}/gdm
+%dir %{_libdir}/gdm/simple-greeter
+%dir %{_libdir}/gdm/simple-greeter/extensions
+%attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
+%attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libpassword.so
+%attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
 %attr(755,root,root) %{_libexecdir}/gdm-crash-logger
 %attr(755,root,root) %{_libexecdir}/gdm-factory-slave
 %attr(755,root,root) %{_libexecdir}/gdm-host-chooser
@@ -252,10 +343,8 @@ fi
 %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}/*
+%attr(755,root,root) %{_libexecdir}/gdm-smartcard-worker
 %dir %{_sysconfdir}/gdm
 %dir %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
@@ -265,23 +354,64 @@ 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) %{_sysconfdir}/dbus-1/system.d/*
+%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) %{_localstatedir}/gdm
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
+%{_sysconfdir}/dconf/db/gdm.d
+%{_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(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
+%{systemdtmpfilesdir}/%{name}.conf
 %{_pixmapsdir}/*
 %{_datadir}/gdm
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 %{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/gnome-session/sessions/gdm-fallback.session
+%{_datadir}/gnome-session/sessions/gdm-shell.session
+%{_datadir}/xsessions/custom.desktop
+%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
-%{_libdir}/bonobo/servers/*.server
-%{_localstatedir}/lib/gdm
-%attr(750,xdm,xdm) %dir /var/cache/gdm
+%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgdmgreeter.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libgdmgreeter.so.1
+%attr(755,root,root) %{_libdir}/libgdmsimplegreeter.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libgdmsimplegreeter.so.1
+%{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
+
+%files devel
+%defattr(644,root,root,755)
+%dir %{_includedir}/gdm
+%dir %{_includedir}/gdm/greeter
+%{_includedir}/gdm/greeter/gdm-greeter-client.h
+%{_includedir}/gdm/greeter/gdm-greeter-sessions.h
+%dir %{_includedir}/gdm/simple-greeter
+%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
+%{_pkgconfigdir}/gdmgreeter.pc
+%{_pkgconfigdir}/gdmsimplegreeter.pc
+%{_libdir}/libgdmgreeter.so
+%{_libdir}/libgdmsimplegreeter.so
+%{_datadir}/gir-1.0/GdmGreeter-1.0.gir
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgdmgreeter.a
+%{_libdir}/libgdmsimplegreeter.a
 
 %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