# TODO:
# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# - check /etc/pam.d/gdm-autologin
-# - ConsoleKit support
#
# Conditiional build:
%bcond_without selinux # without selinux
Summary(pt_BR.UTF-8): Gerenciador de Entrada do GNOME
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
-Name: gdm
-Version: 2.18.1
-Release: 2
-Epoch: 1
+Name: gdm2.20
+Version: 2.20.11
+Release: 3
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: a80e26d98adbe485aac0f9aee64b92b1
-Source1: %{name}.pamd
-Source2: %{name}.init
-Source3: %{name}-pld-logo.png
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
+# Source0-md5: 67696b64c81c317f61065810a32e8b36
+Source1: gdm.pamd
+Source2: gdm.init
+Source3: gdm-pld-logo.png
# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
-Source4: %{name}-storky.tar.gz
+Source4: gdm-storky.tar.gz
# Source4-md5: e293fbe4a60004056f6894463b874ae8
-Source5: %{name}-autologin.pamd
-Patch0: %{name}-xdmcp.patch
-Patch1: %{name}-conf.patch
-Patch2: %{name}-xsession.patch
-Patch3: %{name}-logdir.patch
-Patch4: %{name}-desktop.patch
-Patch5: %{name}-xorg.patch
-Patch6: %{name}-sessreg.patch
-URL: http://www.jirka.org/gdm.html
+Source5: gdm-autologin.pamd
+Patch0: gdm-xdmcp.patch
+Patch1: gdm-conf.patch
+Patch2: gdm-xsession.patch
+Patch3: gdm-desktop.patch
+Patch4: gdm-defaults.patch
+URL: http://www.gnome.org/projects/gdm/
+BuildRequires: ConsoleKit-devel
BuildRequires: attr-devel
+BuildRequires: audit-libs-devel
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: dbus-glib-devel >= 0.73
+BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.10.10
-BuildRequires: intltool >= 0.35.5
+BuildRequires: gnome-common
+BuildRequires: gnome-doc-utils
+BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: intltool >= 0.36.1
BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
-BuildRequires: libgsf-devel >= 1.14.2
-BuildRequires: librsvg-devel >= 1:2.16.1
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.20.0
+BuildRequires: libgsf-devel >= 1.14.6
+BuildRequires: librsvg-devel >= 1:2.18.1
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.27
+BuildRequires: libxml2-devel >= 1:2.6.29
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper
+BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libdmx-devel
-Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
+BuildRequires: zenity
Requires(post,postun): /usr/bin/scrollkeeper-update
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): hicolor-icon-theme
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: libgnomeui >= 2.18.1
+Requires: libgnomeui >= 2.20.0
Requires: pam >= 0.99.7.1
Requires: which
Requires: xorg-app-sessreg
+Requires: xorg-app-xmodmap
+Suggests: zenity
+Provides: XDM
+Provides: gdm = 2:%{version}
Provides: group(xdm)
Provides: user(xdm)
-Obsoletes: X11-xdm
-Obsoletes: entrance
-Obsoletes: kdm
-Obsoletes: slim
-Obsoletes: wdm
-Obsoletes: xdm
+Obsoletes: gdm <= 2:%{version}
Conflicts: gdkxft
+Conflicts: gdm > 2:%{version}
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _localstatedir /var/lib
Summary: Xnest (ie embedded X) server for GDM
Summary(pl.UTF-8): Serwer Xnest dla GDM
Group: X11/Applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: xorg-xserver-Xnest
+Obsoletes: gdm-Xnest <= 2:%{version}
%description Xnest
This package add support for Xnest server in gdm.
Summary(pl.UTF-8): Skrypt init dla GDM-a
Group: X11/Applications
Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: open
+Obsoletes: gdm-init <= 2:%{version}
+Conflicts: gdm-init > 2:%{version}
%description init
Init script for GDM.
Skrypt init dla GDM-a.
%prep
-%setup -q -a4
+%setup -q -a4 -n gdm-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
%build
%{__libtoolize}
%{__autoconf}
%{__automake}
%configure \
+ LIBS="-lXau" \
--disable-console-helper \
--disable-scrollkeeper \
+ --with-console-kit=yes \
--enable-authentication-scheme=pam \
+ --enable-secureremote \
--with-pam-prefix=/etc \
--with-tcp-wrappers=yes \
--with%{!?with_selinux:out}-selinux \
+ --with-libaudit=yes \
--with-xdmcp=yes \
- --with-xinerama=yes
+ --with-xinerama=yes \
+ --with-dmx=yes \
+ --enable-ipv6=yes
%{__make}
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
-%find_lang %{name} --all-name --with-gnome
+%find_lang gdm --with-gnome --with-omf --all-name
# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%groupremove xdm
fi
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- gdm < 1:2.13.0.8-1
if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
fi
/sbin/chkconfig --del gdm
fi
-%files -f %{name}.lang
+%files -f gdm.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/gdm-dmx-reconnect-proxy
%attr(755,root,root) %{_bindir}/gdmflexiserver
%attr(755,root,root) %{_bindir}/gdmphotosetup
%attr(755,root,root) %{_bindir}/gdmthemetester
+%attr(755,root,root) %{_libdir}/gdm-ssh-session
%attr(755,root,root) %{_libdir}/gdmaskpass
%attr(755,root,root) %{_libdir}/gdmopen
%attr(755,root,root) %{_libdir}/gdmtranslate
%attr(755,root,root) %{_libdir}/gdmgreeter
%attr(755,root,root) %{_libdir}/gdmlogin
%attr(755,root,root) %{_sbindir}/*
+
%dir %{_sysconfdir}/gdm
+%dir %{_sysconfdir}/gdm/Init
+%dir %{_sysconfdir}/gdm/PreSession
+%dir %{_sysconfdir}/gdm/PostSession
+%dir %{_sysconfdir}/gdm/PostLogin
%dir %{_sysconfdir}/gdm/modules
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init
-%attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
-%config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%config %{_sysconfdir}/gdm/locale.alias
-%config %{_sysconfdir}/gdm/modules/*
-
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/Init/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PostLogin/Default.sample
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PostSession/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PreSession/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/XKeepsCrashing
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/Xsession
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/locale.alias
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/modules/*
%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) /var/lib/gdm
+%attr(1770,root,xdm) /var/lib/gdm
%attr(750,xdm,xdm) /var/log/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
-%{_desktopdir}/gdmsetup.desktop
-%{_desktopdir}/gdmflexiserver.desktop
-%{_desktopdir}/gdmphotosetup.desktop
%{_datadir}/gdm
-#%%{_datadir}/xsessions - moved to gnome-session
%{_datadir}/xsessions/default.desktop
+%{_datadir}/xsessions/ssh.desktop
%{_iconsdir}/hicolor/*/apps/*.png
-%{_omf_dest_dir}/gdm
+%{_iconsdir}/hicolor/*/apps/*.svg
%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
%{_mandir}/man1/gdm*
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gdmXnest
%attr(755,root,root) %{_bindir}/gdmXnestchooser
-%{_desktopdir}/gdmflexiserver-xnest.desktop
%files init
%defattr(644,root,root,755)
projects / packages / gdm2.20.git / blobdiff