- 2.14.1, added makefile patch and source missing from tarball to fix

[packages/gdm2.20.git] / gdm.spec

diff --git a/gdm.spec b/gdm.spec
index aa3786cac8b034f26045fd08af5f9acd9a3fdc0c..7871c217598dbd3294dfef5bf5c73aad783a1f04 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,13 +14,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.8.0.2
-Release:       0.1
+Version:       2.14.1
+Release:       1
 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: 738287f41471194b1b770a145590dc44
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 5bafb764f36d7caf5d2217de0b6ceba5
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -28,13 +28,14 @@ Source3:    %{name}-pld-logo.png
 Source4:       %{name}-storky.tar.gz
 # Source4-md5: e293fbe4a60004056f6894463b874ae8
 Source5:       %{name}-autologin.pamd
+Source6:       %{name}-gdmthemetester.in
 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
+Patch6:                %{name}-makefile.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: attr-devel
 BuildRequires: autoconf
@@ -54,6 +55,10 @@ BuildRequires:       libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
 BuildRequires: rpmbuild(macros) >= 1.231
+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
@@ -61,7 +66,7 @@ Requires(postun):     /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires:      libgnome >= 2.6.1
-Requires:      sessreg
+Requires:      xorg-app-sessreg
 Requires:      which
 Requires:      pam >= 0.79.0
 Provides:      group(xdm)
@@ -74,7 +79,6 @@ Obsoletes:    xdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11
 %define                _localstatedir  /var/lib
 
 %description
@@ -117,7 +121,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.
@@ -147,7 +151,9 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+%patch6 -p0
+
+cp %{SOURCE6} gui/greeter/gdmthemetester.in
 
 %build
 %{__libtoolize}
@@ -157,13 +163,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 +184,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
@@ -216,13 +224,25 @@ 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 \"service gdm restart\" to restart gdm." >&2
+        echo "WARNING: it will terminate all sessions opened from gdm!" >&2
+else
+        echo "Run \"service gdm start\" to start gdm." >&2
+fi
 
 %preun init
 if [ "$1" = "0" ]; then
-       %service -q gdm stop
+       if [ -f /var/lock/subsys/gdm ]; then
+               /etc/rc.d/init.d/gdm stop >&2
+       fi
        /sbin/chkconfig --del gdm
 fi
 
@@ -248,12 +268,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
@@ -262,7 +282,7 @@ fi
 %{_pixmapsdir}/*
 %{_desktopdir}/gdmsetup.desktop
 %{_desktopdir}/gdmflexiserver.desktop
-%{_datadir}/gnome/capplets/*
+%{_desktopdir}/gdmphotosetup.desktop
 %{_datadir}/gdm
 #%%{_datadir}/xsessions  -  moved to gnome-session
 %{_datadir}/xsessions/default.desktop