]> git.pld-linux.org Git - packages/gdm.git/blobdiff - gdm.spec
- merged 2.6.0.0 from DEVEL
[packages/gdm.git] / gdm.spec
index 8fa65d1f5dd36e526ac2a629a03912ada91cff11..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,37 +11,39 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.4.2.99
-Release:       0.90
+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: e89b869f2f877b5eb2635b8797731791
+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
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
+Patch2:                %{name}-xsession.patch
+Patch3:                %{name}-logdir.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.0.6
-BuildRequires: intltool >= 0.22
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomecanvas-devel >= 2.0.3
-BuildRequires: libgnome-devel >= 2.0.6
-BuildRequires: libgnomeui-devel >= 2.0.4
-BuildRequires: librsvg-devel >= 2.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 >= 1:2.6.1-2
+BuildRequires: libselinux-devel
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.4.24
+BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
-BuildRequires: libgsf-devel
-Requires:      libgnome >= 2.1.0-3
-Requires:      which
-Requires:      sessreg
+BuildRequires: scrollkeeper
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -50,6 +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.6.0
+Requires:      sessreg
+Requires:      which
+Requires:      pam >= 0.77.3-7
 Obsoletes:     xdm kdm wdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,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
@@ -109,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
@@ -122,11 +127,17 @@ Skrypt init dla GDM-a.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+mv po/{no,nb}.po
 
 %build
 rm -f missing
 %{__libtoolize}
 glib-gettextize --copy --force
+intltoolize --copy --force
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -136,19 +147,22 @@ glib-gettextize --copy --force
        --with-pam-prefix=/etc \
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
-       --disable-console-helper
+       --disable-console-helper \
+       --with-selinux
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
-       $RPM_BUILD_ROOT/home/services/xdm
+       $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm}
 
 %{__make} install \
        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
 
@@ -161,11 +175,22 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 # 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
 
 %pre
-/usr/sbin/groupadd -g 55 -r -f xdm
+if [ -n "`getgid xdm`" ]; then
+       if [ "`getgid xdm`" != "55" ]; then
+                echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
+                exit 1
+        fi
+else
+       /usr/sbin/groupadd -g 55 -r -f xdm
+fi
+
 
 if [ -z "`id -u xdm 2>/dev/null`" ]; then
        /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
@@ -225,21 +250,24 @@ fi
 %config %{_sysconfdir}/gdm/factory-gdm.conf
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
 %config %{_sysconfdir}/gdm/modules/*
-%{_sysconfdir}/dm/Sessions/*.desktop
 
 %config(noreplace)  %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
 %config %{_sysconfdir}/gdm/locale.alias
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.gdm
 %attr(750,xdm,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
 %{_datadir}/gnome/capplets/*
 %{_datadir}/gdm
+#%%{_datadir}/xsessions  -  moved to gnome-session
+%{_datadir}/xsessions/default.desktop
 %{_omf_dest_dir}/gdm
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
+%{_mandir}/man1/gdm*
 
 %files Xnest
 %defattr(644,root,root,755)
This page took 0.048604 seconds and 4 git commands to generate.