- dropped _localstatedir macro abuse; don't package invalid /var/gdm directory

[packages/gdm.git] / gdm.spec

diff --git a/gdm.spec b/gdm.spec
index 87837ecae548db8b84a8b28cfd7f0be4644bcc08..2b7084d83a26ae326961ff27bb5af0391e5de2e7 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -19,17 +19,19 @@ Summary(pt_BR.UTF-8):       Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):     Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
-Version:       2.28.1
+Version:       2.28.2
 Release:       1
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 917dc80f5ef6adcdc15193de238476db
+# Source0-md5: 9607c6bac31c9d8bd3446e66a4576c2e
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
 #Source4:      %{name}-autologin.pamd
+Source5:       %{name}-custom.desktop
+Source6:       %{name}-default.desktop
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-polkit.patch
 Patch2:                %{name}-xsession.patch
@@ -61,6 +63,7 @@ BuildRequires:        libxklavier-devel >= 4.0-2
 BuildRequires: pam-devel
 BuildRequires: perl-modules
 BuildRequires: pkgconfig
+BuildRequires: polkit-gnome-devel >= 0.92
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
@@ -69,15 +72,15 @@ BuildRequires:      xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libdmx-devel
 Requires(post,preun):  GConf2
+Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires:      /usr/bin/Xorg
+Requires:      /usr/bin/X
 Requires:      gnome-session >= 2.24.0
 Requires:      gnome-settings-daemon >= 2.24.0
 Requires:      pam >= 0.99.7.1
@@ -85,6 +88,7 @@ Requires:     polkit-gnome >= 0.92
 Requires:      which
 Requires:      xorg-app-sessreg
 Requires:      xorg-app-xmodmap
+Suggests:      zenity
 Provides:      XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
@@ -195,6 +199,7 @@ rm -f data/gdm.schemas.in
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
        $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
+       $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -210,11 +215,9 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
-# 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
+# allow executing ~/.Xclients and ~/.xsession
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -285,21 +288,22 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
 %{_sysconfdir}/gdm/gdm.schemas
 %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 %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(1770,root,xdm) %{_localstatedir}/gdm
-%attr(1755,root,xdm) %{_localstatedir}/cache/gdm
-%attr(1770,root,xdm) %dir %{_localstatedir}/lib/gdm
-%attr(1750,root,xdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
-%attr(1777,root,xdm) %{_localstatedir}/run/gdm
+%attr(1755,root,xdm) /var/cache/gdm
+%attr(1770,root,xdm) %dir /var/lib/gdm
+%attr(1750,root,xdm) %dir /var/lib/gdm/.gconf.mandatory
+%attr(1640,root,xdm) /var/lib/gdm/.gconf.mandatory/*.xml
+%attr(644,root,xdm) /var/lib/gdm/.gconf.path
+%attr(750,xdm,xdm) /var/log/gdm
+%attr(1777,root,xdm) /var/run/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm
 %{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/xsessions/custom.desktop
+%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
 
 %files init