Update to 3.16.1.1

[packages/gdm.git] / gdm.spec

diff --git a/gdm.spec b/gdm.spec
index e197b55cf88ce1eac98e2d6c1d71b84076b50ed2..1e60635f733d7ada872caba876eec09980273c2a 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -7,7 +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.35.0
+%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 ディスプレイマネージャ
@@ -16,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.10.0.1
-Release:       2
+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.10/%{name}-%{version}.tar.xz
-# Source0-md5: 010a8615d7ee99d59494641a7201957e
+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
@@ -43,7 +43,7 @@ BuildRequires:        audit-libs-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.11
 BuildRequires: check-devel >= 0.9.4
-BuildRequires: gettext-devel >= 0.17
+BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= 0.9.12
 BuildRequires: gtk+3-devel >= 3.0.0
@@ -67,7 +67,6 @@ 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-xserver-Xephyr
 BuildRequires: xz
 BuildRequires: yelp-tools
@@ -265,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
 
@@ -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,8 +317,15 @@ 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)
@@ -332,8 +336,8 @@ fi
 %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-slave
-%attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
+%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
@@ -346,12 +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/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
@@ -360,17 +361,16 @@ fi
 %{systemdtmpfilesdir}/%{name}.conf
 %{_pixmapsdir}/*
 %{_datadir}/gdm
-%{_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
 %{_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)