Author: qboosh Date: Sat Oct 14 21:53:01 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - fix apps paths in xdm-xinitrc; require used apps (xconsole, xsetroot) - merged post/preun scripts for monolith, chkconfig deps - release 0.2
---- Files affected: SPECS: xorg-app-xdm.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xdm.spec diff -u SPECS/xorg-app-xdm.spec:1.14 SPECS/xorg-app-xdm.spec:1.15 --- SPECS/xorg-app-xdm.spec:1.14 Sat Oct 14 22:37:46 2006 +++ SPECS/xorg-app-xdm.spec Sat Oct 14 23:52:56 2006 @@ -5,7 +5,7 @@ Summary(uk): íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŔ X Name: xorg-app-xdm Version: 1.1.0 -Release: 0.1 +Release: 0.2 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2 @@ -31,7 +31,12 @@ BuildRequires: xorg-lib-libXt-devel >= 1.0.0 BuildRequires: xorg-lib-xtrans-devel BuildRequires: xorg-util-util-macros >= 0.99.2 +Requires(post,preun): /sbin/chkconfig Requires: mktemp +Requires: pam >= 0.79.0 +Requires: rc-scripts +Requires: xorg-app-xconsole +Requires: xorg-app-xsetroot Requires: xorg-app-sessreg Requires: xorg-lib-libXt >= 1.0.0 Provides: XDM @@ -68,6 +73,8 @@ sed -i -e 's:DEF_AUTH_DIR, XDMCONFIGDIR,:DEF_AUTH_DIR, /var/lib/xdm,:' configure.ac +sed -i -e 's:/usr/X11R6/bin:/usr/bin:' xdm-xinitrc-*/{Xsetup_0,GiveConsole,TakeConsole} + %build %{__libtoolize} %{__aclocal} @@ -106,6 +113,21 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +/sbin/chkconfig --add xdm +if [ -f /var/lock/subsys/xdm ]; then + echo "Run \"/sbin/service xdm restart\" to restart xdm." >&2 + echo "WARNING: it will terminate all sessions opened from xdm!" >&2 +else + echo "Run \"/sbin/service xdm start\" to start xdm." >&2 +fi + +%preun +if [ "$1" = "0" ]; then + /sbin/chkconfig --del xdm + %service xdm stop +fi + %files %defattr(644,root,root,755) %doc COPYING ChangeLog @@ -144,6 +166,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2006/10/14 21:52:56 qboosh +- fix apps paths in xdm-xinitrc; require used apps (xconsole, xsetroot) +- merged post/preun scripts for monolith, chkconfig deps +- release 0.2 + Revision 1.14 2006/10/14 20:37:46 qboosh - build with default vt=vt9 (following X11-xdm-fixes patch) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xdm.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
