]> git.pld-linux.org Git - packages/gdm2.20.git/blobdiff - gdm2.20.spec
- sync with stable branch, cut changelog
[packages/gdm2.20.git] / gdm2.20.spec
index e498d8919aa984f8e63e6171385921ae7f9bbcb2..8ee1a8307ec16e04a9593a0dfad07445cb68b2b8 100644 (file)
@@ -1,3 +1,4 @@
+#
 # TODO:
 # /etc/X11/dm dir should belong to XFree? It is common for KDE and GNOME
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
@@ -14,13 +15,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.8.0.4
-Release:       1
+Version:       2.14.7
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5: d08cb22cfdc26f98d8b033cd8b8c48f1
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 4327f96814552d7b04c7cfdc19483b41
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -32,9 +33,8 @@ Patch0:               %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
 Patch3:                %{name}-logdir.patch
-Patch4:                %{name}-default_theme.patch
-Patch5:                %{name}-desktop.patch
-patch6:                %{name}-vt_9.patch
+Patch4:                %{name}-desktop.patch
+Patch5:                %{name}-xorg.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: attr-devel
 BuildRequires: autoconf
@@ -43,24 +43,30 @@ BuildRequires:      gettext-devel
 BuildRequires: gtk+2-devel >= 2:2.4.3
 BuildRequires: intltool >= 0.30
 BuildRequires: libglade2-devel >= 1:2.4.1
-BuildRequires: libgnome-devel >= 2.6.1
-BuildRequires: libgnomecanvas-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnome-devel >= 2.14.1
+BuildRequires: libgnomecanvas-devel >= 2.14.0
+BuildRequires: libgnomeui-devel >= 2.14.1
 BuildRequires: libgsf-devel >= 1.9.0
-BuildRequires: librsvg-devel >= 1:2.6.5
+BuildRequires: librsvg-devel >= 1:2.14.3
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.231
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: xorg-lib-libdmx-devel
+BuildRequires: xorg-lib-libXdmcp-devel
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXinerama-devel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires:      libgnome >= 2.6.1
+Requires:      libgnome >= 2.14.1
+Requires:      libgnomecanvas >= 2.14.0
+Requires:      libgnomeui >= 2.14.1
 Requires:      sessreg
 Requires:      which
 Requires:      pam >= 0.79.0
@@ -74,7 +80,6 @@ Obsoletes:    xdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11
 %define                _localstatedir  /var/lib
 
 %description
@@ -117,7 +122,7 @@ Summary:    Xnest (ie embedded X) server for GDM
 Summary(pl):   Serwer Xnest dla GDM
 Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      XFree86-Xnest
+Requires:      xorg-xserver-Xnest
 
 %description Xnest
 This package add support for Xnest server in gdm.
@@ -146,8 +151,6 @@ Skrypt init dla GDM-a.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -157,13 +160,14 @@ Skrypt init dla GDM-a.
 %{__autoconf}
 %{__automake}
 %configure \
-       --with-xinerama=yes \
-       --with-xdmcp=yes \
+       --disable-console-helper \
+       --disable-scrollkeeper \
+       --enable-authentication-scheme=pam \
        --with-pam-prefix=/etc \
        --with-tcp-wrappers=yes \
-       --enable-authentication-scheme=pam \
-       --disable-console-helper \
-       --with%{!?with_selinux:out}-selinux
+       --with%{!?with_selinux:out}-selinux \
+       --with-xdmcp=yes \
+       --with-xinerama=yes
 
 %{__make}
 
@@ -177,7 +181,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
+mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop \
+       $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
@@ -189,8 +194,6 @@ install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files
@@ -204,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 55 -r -f xdm
-%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm
+%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
 %scrollkeeper_update_post
@@ -216,13 +219,23 @@ if [ "$1" = "0" ]; then
        %groupremove xdm
 fi
 
+%triggerpostun -- %{name} < 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
+
 %post init
 /sbin/chkconfig --add gdm
-%service gdm restart
+if [ -f /var/lock/subsys/gdm ]; then
+       echo "Run \"/sbin/service gdm restart\" to restart gdm." >&2
+       echo "WARNING: it will terminate all sessions opened from gdm!" >&2
+else
+       echo "Run \"/sbin/service gdm start\" to start gdm." >&2
+fi
 
 %preun init
 if [ "$1" = "0" ]; then
-       %service -q gdm stop
+       %service gdm stop
        /sbin/chkconfig --del gdm
 fi
 
@@ -248,12 +261,12 @@ fi
 %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/factory-gdm.conf
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
+%config %{_sysconfdir}/gdm/locale.alias
 %config %{_sysconfdir}/gdm/modules/*
 
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/gdm.conf
-%config %{_sysconfdir}/gdm/locale.alias
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
+
 %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
This page took 0.485949 seconds and 4 git commands to generate.