diff --git a/.cvsignore b/.cvsignore index 1a86126..d3e12b3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gdm-2.4.4.5.tar.bz2 +gdm-2.5.90.2.tar.bz2 diff --git a/gdm.spec b/gdm.spec index 4a021f6..9f6341e 100644 --- a/gdm.spec +++ b/gdm.spec @@ -15,65 +15,64 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.4.4.5 -Release: 7 +Version: 2.5.90.2 +Release: 3 Epoch: 1 License: LGPL/GPL Group: User Interface/X Source: ftp://ftp.gnome.org/pub/GNOME/sources/gdm-%{PACKAGE_VERSION}.tar.bz2 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/ -## FIXME: is this relevant? -## temporary ja.po hack for date format -Source7: gdm-ja.po - -Patch1: gdm-2.4.4.3-rhconfig.patch +Patch1: gdm-2.5.90.2-rhconfig.patch ## we're going to try UTF-8 CJK ## Patch2: gdm-2.4.1.1-cjk-no-utf8.patch Patch4: gdm-2.4.2.102-pam_timestamp.patch ## there's no greek font so don't translate greek in language picker, ## it looks awful Patch11: gdm-2.4.0.7-nogreek.patch -Patch12: gdm-2.4.4.5-colorfix.patch Patch13: gdm-selinux.patch -## autotools hates me! -Patch20: gdm-2.4.4.5-autofoo.patch - BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root Prereq: /usr/sbin/useradd Prereq: /usr/bin/scrollkeeper-update -Requires: gtk2 >= %{gtk2_version} -Requires: libglade2 >= %{libglade2_version} -Requires: libgnomeui >= %{libgnomeui_version} -Requires: libgnomecanvas >= %{libgnomecanvas_version} -Requires: librsvg2 >= %{librsvg2_version} -Requires: libxml2 >= %{libxml2_version} -Requires: pam >= %{pam_version} +Requires: gtk2 >= 0:%{gtk2_version} +Requires: libglade2 >= 0:%{libglade2_version} +Requires: libgnomeui >= 0:%{libgnomeui_version} +Requires: libgnomecanvas >= 0:%{libgnomecanvas_version} +Requires: librsvg2 >= 0:%{librsvg2_version} +Requires: libxml2 >= 0:%{libxml2_version} +Requires: pam >= 0:%{pam_version} Requires: /etc/pam.d/system-auth Requires: /etc/X11/xdm/Xsession Requires: usermode -Requires: xinitrc >= 3.33-1 +Requires: xinitrc >= 0:3.33-1 Requires: xsri >= 1:2.0.2 Requires: /sbin/nologin -Requires: redhat-artwork >= 0.9 +Requires: redhat-artwork >= 0:0.9 Requires: /usr/share/desktop-menu-patches/gnome-gdmsetup.desktop -BuildRequires: scrollkeeper >= %{scrollkeeper_version} -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: libglade2-devel >= %{libglade2_version} -BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} -BuildRequires: librsvg2-devel >= %{librsvg2_version} -BuildRequires: libxml2-devel >= %{libxml2_version} +BuildRequires: scrollkeeper >= 0:%{scrollkeeper_version} +BuildRequires: pango-devel >= 0:%{pango_version} +BuildRequires: gtk2-devel >= 0:%{gtk2_version} +BuildRequires: libglade2-devel >= 0:%{libglade2_version} +BuildRequires: libgnomeui-devel >= 0:%{libgnomeui_version} +BuildRequires: libgnomecanvas-devel >= 0:%{libgnomecanvas_version} +BuildRequires: librsvg2-devel >= 0:%{librsvg2_version} +BuildRequires: libxml2-devel >= 0:%{libxml2_version} BuildRequires: usermode -BuildRequires: pam-devel >= %{pam_version} +BuildRequires: pam-devel >= 0:%{pam_version} BuildRequires: fontconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -BuildRequires: gail-devel >= %{gail_version} +BuildRequires: gail-devel >= 0:%{gail_version} BuildRequires: libgsf-devel -BuildRequires: libtool automake autoconf +BuildRequires: libtool automake14 autoconf +BuildRequires: libcroco-devel +BuildRequires: libattr-devel +BuildRequires: gettext + +%if %{WITH_SELINUX} +BuildRequires: libselinux-devel +%endif %description Gdm (the GNOME Display Manager) is a highly configurable @@ -88,13 +87,10 @@ several different X sessions on your local machine at the same time. ## %patch2 -p1 -b .cjk-no-utf8 %patch4 -p1 -b .pam_timestamp %patch11 -p1 -b .nogreek -%patch12 -p1 -b .colorfix %patch13 -p1 -b .selinux -%patch20 -p1 -b .autofoo - -## put in ja translation -cp -f %{SOURCE7} po/ja.po +# fix the time format for ja +perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po %build intltoolize --force --copy @@ -209,10 +205,6 @@ scrollkeeper-update %doc AUTHORS COPYING ChangeLog NEWS README TODO %dir /etc/X11/gdm -# Not sure which package /etc/X11/dm dir should belong to, -# this dir was agreed on among KDM and GDM maintainer to host -# the new session setup -%config /etc/X11/dm/Sessions/* %config /etc/X11/gdm/gdm.conf /etc/X11/gdm/factory-gdm.conf %config /etc/X11/gdm/XKeepsCrashing @@ -247,6 +239,37 @@ scrollkeeper-update %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Mar 16 2004 Dan Walsh 1:2.5.90.3-1 +- Use selinux patch again + +* Tue Mar 16 2004 Dan Walsh 1:2.5.90.3-1 +- Stop using selinux patch and use pam_selinux instead. + +* Wed Mar 10 2004 Alex Larsson 1:2.5.90.2-1 +- update to 2.5.90.2 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 26 2004 Alexander Larsson 1:2.5.90.1-1 +- update to 2.5.90.1 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 03 2004 Warren Togami 1:2.4.4.5-9 +- add two lines to match upstream CVS to xdmcp_sessions.patch + Fully resolves #110315 and #113154 + +* Sun Feb 01 2004 Warren Togami 1:2.4.4.5-8 +- patch30 xdmcp_session counter fix from gdm-2.5.90.0 #110315 +- automake14 really needed, not automake +- BR libcroco-devel, libcroco-devel, libattr-devel, gettext +- conditionally BR libselinux-devel +- explicit epoch in all deps +- make the ja.po time format change with a sed expression rather than + overwriting the whole file (Petersen #113995) + * Thu Jan 29 2004 Jeremy Katz - 1:2.4.4.5-7 - fix build with current auto* diff --git a/sources b/sources index 143320d..713b97a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eae456b3a59154e55d69263aad5e8a54 gdm-2.4.4.5.tar.bz2 +e2054ab6aa9fe5c6e62235b879774074 gdm-2.5.90.2.tar.bz2