X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fgdm.git;a=blobdiff_plain;f=gdm.spec;h=1e60635f733d7ada872caba876eec09980273c2a;hp=00a6ae6e4fd480d7a781b21a79b91b5c5fd74ffa;hb=787341bb0d552aea6a9944ec80f3fd73a5d7d71e;hpb=10a97dacc11905c2affc431c243806bb964f5641

diff --git a/gdm.spec b/gdm.spec
index 00a6ae6..1e60635 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -7,6 +7,7 @@
 # Conditional build:
 %bcond_without  systemd # by default use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 
+%define		glib2_version 1:2.36.0
 Summary:	GNOME Display Manager
 Summary(es.UTF-8):	Administrador de Entrada del GNOME
 Summary(ja.UTF-8):	GNOME ディスプレイマネージャ
@@ -15,13 +16,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	3.6.0
-Release:	5
+Version:	3.16.1.1
+Release:	1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.6/%{name}-%{version}.tar.xz
-# Source0-md5:	5a11f89761612e35cd326de347a97e14
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.16/%{name}-%{version}.tar.xz
+# Source0-md5:	0b315af5fe0ee66055edb6f301510820
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -31,7 +32,7 @@ Source6:	%{name}-default.desktop
 Source7:	%{name}.upstart
 Source9:	%{name}.tmpfiles
 Source10:	%{name}-fingerprint.pamd
-Source11:	gdm-launch-environment.pamd
+Source11:	%{name}-launch-environment.pamd
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-xsession.patch
 Patch2:		%{name}-defaults.patch
@@ -41,12 +42,10 @@ BuildRequires:	accountsservice-devel >= 0.6.12
 BuildRequires:	audit-libs-devel
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	check >= 0.9.4
-BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	fontconfig-devel >= 2.5.0
-BuildRequires:	gettext-devel >= 0.17
-BuildRequires:	glib2-devel >= 1:2.33.2
-BuildRequires:	yelp-tools
+BuildRequires:	check-devel >= 0.9.4
+BuildRequires:	gettext-tools >= 0.17
+BuildRequires:	glib2-devel >= %{glib2_version}
+BuildRequires:	gobject-introspection-devel >= 0.9.12
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes
@@ -54,27 +53,24 @@ BuildRequires:	libcanberra-gtk3-devel >= 0.4
 BuildRequires:	libselinux-devel
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
-BuildRequires:	gobject-introspection-devel >= 0.9.12
-BuildRequires:	nss-devel >= 3.11.1
 BuildRequires:	pam-devel
-BuildRequires:	pango-devel >= 1.3.0
 BuildRequires:	pkgconfig
 BuildRequires:	plymouth-devel
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.627
-%{?with_systemd:BuildRequires:  systemd-devel}
+%{?with_systemd:BuildRequires:	systemd-devel >= 186}
 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-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXrandr-devel
-BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-xserver-Xephyr
 BuildRequires:	xz
-Requires(post,postun):	glib2 >= 1:2.33.2
+BuildRequires:	yelp-tools
+Requires(post,postun):	glib2 >= %{glib2_version}
 Requires(post,postun):	gtk-update-icon-cache
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -87,6 +83,7 @@ Requires:	/usr/bin/X
 Requires:	accountsservice >= 0.6.12
 Requires:	dbus-x11
 Requires:	gdm-wm >= 3.2.1
+Requires:	glib2 >= %{glib2_version}
 Requires:	gnome-session >= 3.0.0
 Requires:	gnome-settings-daemon >= 3.0.0
 Requires:	hicolor-icon-theme
@@ -98,6 +95,7 @@ Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
 Suggests:	ConsoleKit-x11 >= 0.4.1
 Suggests:	pam-pam_gnome_keyring
+Suggests:	xorg-xserver-Xephyr
 Suggests:	zenity
 Provides:	XDM
 Provides:	group(xdm)
@@ -109,6 +107,7 @@ Obsoletes:	gnome-applet-fast-user-switch
 Conflicts:	gdkxft
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
+Conflicts:	systemd < 186
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -217,7 +216,7 @@ Opis zadania Upstart dla GDM.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#patch3 -p1
 
 %build
 touch data/gdm.schemas.in.in
@@ -229,6 +228,7 @@ touch data/gdm.schemas.in.in
 %{__autoconf}
 %{__automake}
 %configure \
+	SYSTEMD_X_SERVER=/lib/systemd/systemd-multi-seat-x \
 	%{?debug:--enable-debug} \
 	--disable-console-helper \
 	--disable-silent-rules \
@@ -264,7 +264,7 @@ 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
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
@@ -274,8 +274,7 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdm/simple-greeter/extensions/*.{a,la} \
-    $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -289,13 +288,11 @@ umask 022
 %useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
-%glib_compile_schemas
 %update_icon_cache hicolor
 
 %postun
 %update_icon_cache hicolor
 if [ "$1" = "0" ]; then
-	%glib_compile_schemas
 	%userremove xdm
 	%groupremove xdm
 fi
@@ -320,29 +317,27 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del gdm
 fi
 
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+%glib_compile_schemas
+
+%postun libs
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+	%glib_compile_schemas
+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
-%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) %{_bindir}/gdmflexiserver
 %attr(755,root,root) %{_libexecdir}/gdm-host-chooser
 %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) %{_libexecdir}/gdm-smartcard-worker
+%attr(755,root,root) %{_libdir}/gdm-wayland-session
+%attr(755,root,root) %{_libdir}/gdm-x-session
 %dir %{_sysconfdir}/gdm
 %dir %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
@@ -355,13 +350,9 @@ fi
 %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
-%{_sysconfdir}/dconf/db/gdm.d
-%{_sysconfdir}/dconf/profile/gdm
+%{_datadir}/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
@@ -370,20 +361,16 @@ fi
 %{systemdtmpfilesdir}/%{name}.conf
 %{_pixmapsdir}/*
 %{_datadir}/gdm
-%{_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
-%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgdm.so.1.0.0
 %attr(755,root,root) %ghost %{_libdir}/libgdm.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/Gdm-1.0.typelib
+%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 
 %files devel
 %defattr(644,root,root,755)
@@ -392,18 +379,13 @@ fi
 %{_includedir}/gdm/gdm-client.h
 %{_includedir}/gdm/gdm-sessions.h
 %{_includedir}/gdm/gdm-user-switching.h
-%dir %{_includedir}/gdm/simple-greeter
-%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
 %{_pkgconfigdir}/gdm.pc
-%{_pkgconfigdir}/gdmsimplegreeter.pc
 %{_libdir}/libgdm.so
-%{_libdir}/libgdmsimplegreeter.so
 %{_datadir}/gir-1.0/Gdm-1.0.gir
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgdm.a
-%{_libdir}/libgdmsimplegreeter.a
 
 %files init
 %defattr(644,root,root,755)