Author: freetz Date: Fri Feb 17 14:23:57 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.13.0.8, configraution moved to /etc/gdm, added trigger
---- Files affected: SPECS: gdm.spec (1.172.2.1 -> 1.172.2.2) ---- Diffs: ================================================================ Index: SPECS/gdm.spec diff -u SPECS/gdm.spec:1.172.2.1 SPECS/gdm.spec:1.172.2.2 --- SPECS/gdm.spec:1.172.2.1 Fri Feb 10 09:39:31 2006 +++ SPECS/gdm.spec Fri Feb 17 15:23:52 2006 @@ -15,13 +15,13 @@ Summary(ru): äÉÓĐĚĹĘÎŮĘ ÍĹÎĹÄÖĹŇ GNOME Summary(uk): äÉÓĐĚĹĘÎÉĘ ÍĹÎĹÄÖĹŇ GNOME Name: gdm -Version: 2.13.0.7 +Version: 2.13.0.8 Release: 1 Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.13/%{name}-%{version}.tar.bz2 -# Source0-md5: 70e469f85686ad861c1a8208ca231e9f +# Source0-md5: 085bbbe90579f00d0ab5dc19d9c8765a Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}-pld-logo.png @@ -73,7 +73,6 @@ Conflicts: gdkxft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/X11 %define _localstatedir /var/lib %description @@ -143,7 +142,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -#%patch3 -p1 +%patch3 -p1 %patch4 -p1 %build @@ -175,7 +174,8 @@ 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 @@ -214,6 +214,11 @@ %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 if [ -f /var/lock/subsys/gdm ]; then @@ -253,13 +258,12 @@ %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(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/gdm.conf-custom -%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 @@ -293,6 +297,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.172.2.2 2006/02/17 14:23:52 freetz +- 2.13.0.8, configraution moved to /etc/gdm, added trigger + Revision 1.172.2.1 2006/02/10 08:39:31 freetz - 2.13.0.7, vt_9, logdir, default_theme patches incorporated into conf patch, switched to modular xorg ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.172.2.1&r2=1.172.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
