- merged 2.6.0.0 from DEVEL

Changed files:
    gdm.spec -> 1.128

diff --git a/gdm.spec b/gdm.spec
index cd8a1cdfc34787daf1d06472b8c63c60753c0fc2..11e749b6a068145e8cf3fe0e3f7b7146835ae03c 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -3,7 +3,6 @@
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
 # check /etc/pam.d/gdm-autologin
 #
-
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
 Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
@@ -12,13 +11,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.4.4.7
-Release:       1.9
+Version:       2.6.0.0
+Release:       3
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: a3d2f243c4f42e2542bda8cb5fb9a7c5
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 3dbf4074a4ec78627a5d099d30126d45
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -26,19 +25,20 @@ Patch0:             %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
 Patch3:                %{name}-logdir.patch
-Patch4:                %{name}-intltool.patch
+Patch4:                %{name}-locale-names.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.2.4
-BuildRequires: intltool >= 0.22
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnome-devel >= 2.4.0
-BuildRequires: libgnomecanvas-devel >= 2.4.0
-BuildRequires: libgnomeui-devel >= 2.4.0.1
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: intltool >= 0.30
+BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libgnome-devel >= 2.6.0
+BuildRequires: libgnomecanvas-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: libgsf-devel >= 1.8.2
-BuildRequires: librsvg-devel >= 2.4.0
+BuildRequires: librsvg-devel >= 1:2.6.1-2
+BuildRequires: libselinux-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
@@ -51,10 +51,10 @@ Requires(postun):   /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires:      libgnome >= 2.4.0
+Requires:      libgnome >= 2.6.0
 Requires:      sessreg
 Requires:      which
-Requires:      pam >= 0.77.3
+Requires:      pam >= 0.77.3-7
 Obsoletes:     xdm kdm wdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,7 +101,7 @@ Window 
 Summary:       Xnest (ie embedded X) server for GDM
 Summary(pl):   Serwer Xnest dla GDM
 Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      XFree86-Xnest
 
 %description Xnest
@@ -114,7 +114,7 @@ Ten pakiet dodaje do gdm wsparcie dla Xnest.
 Summary:       Init script for GDM
 Summary(pl):   Skrypt init dla GDM-a
 Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      open
 
 %description init
@@ -131,6 +131,8 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 
+mv po/{no,nb}.po
+
 %build
 rm -f missing
 %{__libtoolize}
@@ -145,7 +147,8 @@ intltoolize --copy --force
        --with-pam-prefix=/etc \
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
-       --disable-console-helper
+       --disable-console-helper \
+       --with-selinux
 
 %{__make}
 
@@ -158,6 +161,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
        DESTDIR=$RPM_BUILD_ROOT \
        PAM_PREFIX=/etc
 
+mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 
@@ -165,13 +170,14 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
-mv $RPM_BUILD_ROOT{%{_sysconfdir}/dm/Sessions/default.desktop,%{_datadir}/xsessions}
-
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
 
+# moved to gnome-session
+rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT