- updated to 3.0.0 version; merged from DEVEL

- fixed polkit patch
- works fine with custom autologin.pamd file (replace provided with sources)

Changed files:
    gdm-polkit.patch -> 1.6
    gdm.spec -> 1.263

diff --git a/gdm-polkit.patch b/gdm-polkit.patch
index c824b4eec565477b35be491cb92b8fe4eafc98f6..3877263694a5b00e47d7c020ab22e1e645dc6cc2 100644 (file)
--- a/gdm-polkit.patch
+++ b/gdm-polkit.patch
@@ -213,8 +213,8 @@ diff -urN gdm-2.29.92/configure.ac gdm-2.29.92.new//configure.ac
  
  DBUS_GLIB_REQUIRED_VERSION=0.74
 +POLKIT_GOBJECT_REQUIRED_VERSION=0.92
- GLIB_REQUIRED_VERSION=2.22.0
- GTK_REQUIRED_VERSION=2.12.0
+ GLIB_REQUIRED_VERSION=2.27.4
+ GTK_REQUIRED_VERSION=2.91.1
  PANGO_REQUIRED_VERSION=1.3.0
 @@ -60,6 +61,7 @@
  

diff --git a/gdm.spec b/gdm.spec
index 140804da4c6274233f82bbccc940a4b9fb4aeadc..02fef6e0dd5c8e912672c0df589d55e530aa0d7a 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -2,6 +2,7 @@
 # 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
@@ -14,17 +15,17 @@ Summary(pt_BR.UTF-8):       Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):     Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
-Version:       2.32.0
-Release:       3
+Version:       3.0.0
+Release:       1
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: 3c28e13a3d5e5f35d29669460acb57bb
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 186ee9a2413ee8eed42699b7119e5624
 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
@@ -32,42 +33,45 @@ Patch1:             %{name}-polkit.patch
 Patch2:                %{name}-xsession.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: UPower-devel
+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:        check >= 0.9.4
+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.22.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: 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-devel
-#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
+BuildRequires: xorg-lib-libXrandr-devel
 Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
 Requires(post,preun):  GConf2
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -75,8 +79,11 @@ Requires(pre):       /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      /usr/bin/X
-Requires:      gnome-session >= 2.30.0
-Requires:      gnome-settings-daemon >= 2.24.0
+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.93
 Requires:      which
@@ -102,9 +109,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 を選択することも可能です。
@@ -166,6 +172,7 @@ do przełączania między użytkownikami.
 %patch3 -p1
 
 %build
+touch data/gdm.schemas.in.in
 %{__libtoolize}
 %{__glib_gettextize}
 %{__intltoolize}
@@ -200,11 +207,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
@@ -260,6 +265,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
@@ -269,8 +278,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
@@ -284,17 +291,24 @@ 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
-%attr(1755,root,xdm) /var/cache/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) /var/log/gdm
-%attr(1777,root,xdm) /var/run/gdm
+%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
@@ -302,9 +316,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