Author: baggins Date: Wed Jul 27 20:11:56 2011 GMT Module: packages Tag: HEAD ---- Log message: - replace wmstyle startup script with script run directly by icewm-session
---- Files affected: packages/icewm: icewm.spec (1.216 -> 1.217) , icewm-startup.sh (NONE -> 1.1) (NEW), IceWM.RunWM (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/icewm/icewm.spec diff -u packages/icewm/icewm.spec:1.216 packages/icewm/icewm.spec:1.217 --- packages/icewm/icewm.spec:1.216 Tue May 31 00:20:26 2011 +++ packages/icewm/icewm.spec Wed Jul 27 22:11:51 2011 @@ -28,7 +28,7 @@ Source1: IceWM.desktop Source3: http://dl.sourceforge.net/icewm/iceicons-%{_iceicons_ver}.tar.gz # Source3-md5: 53ed111a3c4d1e609bd1604ddccd4701 -Source4: IceWM.RunWM +Source4: icewm-startup.sh Source6: http://dl.sourceforge.net/icewm/netscapeicons-%{_netscapeicons_ver}.tar.gz # Source6-md5: 409aa9b02adc11309ed546c5120c01d2 Source7: %{name}-xsession.desktop @@ -61,7 +61,6 @@ Conflicts: filesystem < 3.0-20 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _wmstyledir /etc/sysconfig/wmstyle %define _wmpropsdir /usr/share/gnome/wm-properties %define specflags_ia32 -fomit-frame-pointer @@ -162,14 +161,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir},%{_wmstyledir}} \ +install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_pixmapsdir}} \ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_sysconfdir}/X11/%{name}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir} -install %{SOURCE4} $RPM_BUILD_ROOT%{_wmstyledir}/%{name}-session.sh +install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop install lib/keys $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/keys sed 's|^# IconPath=""|IconPath="%{_datadir}/pixmaps:%{_datadir}/icons"|' < lib/preferences > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/preferences @@ -202,13 +201,13 @@ %{_datadir}/icewm/icons %{_datadir}/icewm/ledclock %{_datadir}/icewm/mailbox +%attr(755,root,root) %{_datadir}/icewm/startup %{_datadir}/icewm/taskbar %dir %{_datadir}/icewm/themes %{_datadir}/icewm/themes/Infadel2 %{_datadir}/icewm/themes/icedesert %{_datadir}/xsessions/%{name}.desktop %{_wmpropsdir}/* -%attr(755,root,root) %{_wmstyledir}/%{name}-session.sh %files themes-base %defattr(644,root,root,755) @@ -228,6 +227,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.217 2011/07/27 20:11:51 baggins +- replace wmstyle startup script with script run directly by icewm-session + Revision 1.216 2011/05/30 22:20:26 gotar - patch for autohide bug #2949425 ================================================================ Index: packages/icewm/icewm-startup.sh diff -u /dev/null packages/icewm/icewm-startup.sh:1.1 --- /dev/null Wed Jul 27 22:11:56 2011 +++ packages/icewm/icewm-startup.sh Wed Jul 27 22:11:51 2011 @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ ! -d ~/.icewm ] ; then + mkdir -p ~/.icewm + install -m 644 /etc/X11/icewm/* ~/.icewm/ +fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icewm/icewm.spec?r1=1.216&r2=1.217&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
