From 8d95b5c805b9b66025714555b343fa8b541790f5131eee59839b6f0f0fdbd96f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 18 Jul 2008 21:58:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=10 --- icewm-lite.spec | 2 +- icewm-preferences.patch | 66 +++++++++++++++++++++++++++++++++++++++++ icewm.changes | 10 +++++++ icewm.spec | 22 +++++++------- 4 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 icewm-preferences.patch diff --git a/icewm-lite.spec b/icewm-lite.spec index a865fd9..474a48e 100644 --- a/icewm-lite.spec +++ b/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 diff --git a/icewm-preferences.patch b/icewm-preferences.patch new file mode 100644 index 0000000..175cb2e --- /dev/null +++ b/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- + quilt push -a + ./configure + 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="" diff --git a/icewm.changes b/icewm.changes index cc2e628..2f6452d 100644 --- a/icewm.changes +++ b/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 diff --git a/icewm.spec b/icewm.spec index 4470044..81c4974 100644 --- a/icewm.spec +++ b/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 %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 %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 <