OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=10

icewm-lite.spec

@@ -20,7 +20,7 @@ Requires:       icewm
 Conflicts:      icewm-default
 AutoReqProv:    on
 Version:        1.2.35
-Release:        15
+Release:        39
 Source:         icewm-%{version}.tar.bz2
 Patch0:         icewm-LANG.menu.patch
 Patch1:         icewm-multiByte.patch

icewm-preferences.patch

@@ -0,0 +1,66 @@
+Tweak default icewm preferences
+
+Attention: this patch is applied in the %build phase, because it patches
+a file generated by ./src/genpref. To edit the patch:
+
+  quilt setup icewm.spec
+  cd icewm-<version>
+  quilt push -a
+  ./configure <options from the spec>
+  make -C src genpref
+  ./src/genpref >lib/preferences
+  quilt import -p0 patches/icewm-preferences.patch
+  quilt push
+  vi lib/preferences
+  quilt refresh
+---
+ lib/preferences |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- lib/preferences.orig
++++ lib/preferences
+@@ -464,7 +464,7 @@
+ # NewMailCommand=""
+ 
+ #  Command to lock display/screensaver
+-# LockCommand=""
++LockCommand="xscreensaver-command -lock || xlock -mousemotion"
+ 
+ #  Command to run on clock
+ # ClockCommand="xclock -name icewm -title Clock"
+@@ -488,10 +488,10 @@
+ # LogoutCancelCommand=""
+ 
+ #  Command to shutdown the system
+-# ShutdownCommand=""
++ShutdownCommand="dbus-send --system --dest=org.freedesktop.Hal --type=method_call --print-reply /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown"
+ 
+ #  Command to reboot the system
+-# RebootCommand=""
++RebootCommand="dbus-send --system --dest=org.freedesktop.Hal --type=method_call --print-reply /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Reboot"
+ 
+ #  Command to run on CPU status
+ # CPUStatusCommand="xterm -name top -title Process\ Status -e top"
+@@ -1223,19 +1223,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
+ #
+ 
+ #  Display desktop background centered and not tiled
+-# DesktopBackgroundCenter=0 # 0/1
++DesktopBackgroundCenter=1 # 0/1
+ 
+ #  Support for semitransparent terminals like Eterm or gnome-terminal
+ # SupportSemitransparency=1 # 0/1
+ 
+ #  Desktop background scaled to full screen
+-# DesktopBackgroundScaled=0 # 0/1
++DesktopBackgroundScaled=1 # 0/1
+ 
+ #  Desktop background color
+ # DesktopBackgroundColor="rgb:00/20/40"
+ 
+ #  Desktop background image
+-# DesktopBackgroundImage=""
++DesktopBackgroundImage="/usr/share/wallpapers/default-1600x1200.jpg"
+ 
+ #  Color to announce for semi-transparent windows
+ # DesktopTransparencyColor=""

icewm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jul 18 17:49:35 CEST 2008 - mmarek@suse.cz
+
+- also fix session locking (use xscreensaver or xlock) (bnc#406156)
+
+-------------------------------------------------------------------
+Fri Jul 18 17:10:36 CEST 2008 - mmarek@suse.cz
+
+- make shutdown and reboot work out of the box (bnc#406156)
+
 -------------------------------------------------------------------
 Fri Mar  7 13:36:51 CET 2008 - mmarek@suse.cz
 

icewm.spec

@@ -22,7 +22,7 @@ Provides:       windowmanager
 Requires:       icewm-bin, xdg-menu, desktop-data
 AutoReqProv:    on
 Version:        1.2.35
-Release:        26
+Release:        66
 Source:         icewm-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Patch0:         icewm-LANG.menu.patch
@@ -34,6 +34,8 @@ Patch5:         icewm-1.2.35-override-config.patch
 Patch6:         icewm-1.2.35-lite-build.patch
 Patch7:         icewm-1.2.35-dialog-center-fix.patch
 Patch8:         icewm-1.2.35-empty-winmenu.patch
+# applied in %%build
+Patch99:        icewm-preferences.patch
 Url:            http://www.icewm.org/
 Summary:        Window Manager with a Taskbar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -52,6 +54,7 @@ Authors:
     Marko Macek <Marko.Macek@gmx.net>
 
 %package default
+License:        LGPL v2.1 or later
 Summary:        Window Manager with a Taskbar--Default Version
 Group:          System/GUI/Other
 Provides:       icewm-bin
@@ -72,6 +75,7 @@ Authors:
     Marko Macek <Marko.Macek@gmx.net>
 
 %package gnome
+License:        LGPL v2.1 or later
 Summary:        Windowmanager with Taskbar - gnome version
 Group:          System/GUI/GNOME
 Requires:       icewm-default
@@ -125,6 +129,7 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig
 	    --with-imlib \
 	    --enable-menus-gnome2
 make %{?jobs:-j%jobs}
+patch -p0 -i %_sourcedir/icewm-preferences.patch
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install install-docs
@@ -135,13 +140,6 @@ for cfgfile in keys menu preferences toolbar winoptions ; do
 done
 %{find_lang} icewm
 ln -s icewm.html $RPM_BUILD_ROOT/%{_docdir}/icewm/index.html
-cat >>$RPM_BUILD_ROOT/etc/icewm/preferences <<EOF
-# set SUSE wallpaper
-DesktopBackgroundCenter=1
-SupportSemitransparency=1
-DesktopBackgroundScaled=1
-DesktopBackgroundImage="/usr/share/wallpapers/default-1600x1200.jpg"
-EOF
 # install the xsession desktop file
 mkdir -p $RPM_BUILD_ROOT/usr/share/xsessions
 cp -f %{SOURCE1} $RPM_BUILD_ROOT/usr/share/xsessions
@@ -176,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT;
 /usr/bin/icewm-menu-gnome2
 
 %changelog
+* Fri Jul 18 2008 mmarek@suse.cz
+- also fix session locking (use xscreensaver or xlock) (bnc#406156)
+* Fri Jul 18 2008 mmarek@suse.cz
+- make shutdown and reboot work out of the box (bnc#406156)
 * Fri Mar 07 2008 mmarek@suse.cz
 - don't popup empty window menu
 * Fri Feb 29 2008 mmarek@suse.cz
@@ -309,7 +311,7 @@ rm -rf $RPM_BUILD_ROOT;
   default fonts when using Xft because the latest fontconfig
   now actually uses the foundry and inserting an dummy value
   doesn't work anymore.
-* Fri Apr 25 2003 lmfabian@suse.de
+* Sat Apr 26 2003 lmfabian@suse.de
 - update to 1.2.7
 - add "fontconfig fontconfig-devel" to neededforbuild
 - icewm-always-use-xft.patch: if we have Xft2, don't disable Xft
@@ -392,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT;
 - added patch to load translated menus from files with a locale
   suffix, e.g. menu.ko, menu.ja ...
 - added Korean translations for menus
-* Tue Nov 28 2000 grimmer@suse.de
+* Wed Nov 29 2000 grimmer@suse.de
 - removed icewm-themes-0.9.42.tar.gz from package
 - moved system-wide configuration files to /etc/X11/icewm
   for better FHS compliance