Hello community, here is the log from the commit of package icewm checked in at Wed Jan 30 02:50:56 CET 2008. -------- --- icewm/icewm.changes 2008-01-28 11:31:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/icewm/icewm.changes 2008-01-29 14:35:15.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 29 14:34:44 CET 2008 - mmarek@suse.cz + +- make icewm --config=file work + (override-config.patch) + +------------------------------------------------------------------- icewm-lite.changes: same change New: ---- icewm-1.2.35-override-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm-lite.spec ++++++ --- /var/tmp/diff_new_pack.NR5291/_old 2008-01-30 02:49:39.000000000 +0100 +++ /var/tmp/diff_new_pack.NR5291/_new 2008-01-30 02:49:39.000000000 +0100 @@ -19,13 +19,14 @@ Conflicts: icewm-default AutoReqProv: on Version: 1.2.35 -Release: 1 +Release: 2 Source: icewm-%{version}.tar.bz2 Patch0: icewm-LANG.menu.patch Patch1: icewm-multiByte.patch Patch2: icewm-menu.patch Patch3: icewm-docdir.patch Patch4: icewm-1.2.30-strict-aliasing.patch +Patch5: icewm-1.2.35-override-config.patch Url: http://www.icewm.org/ Summary: Window Manager with Taskbar--Lite Version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +53,7 @@ %patch2 %patch3 %patch4 +%patch5 %build %{?suse_update_config:%{suse_update_config -f}} @@ -87,6 +89,9 @@ /usr/bin/icewm-session %changelog +* Tue Jan 29 2008 mmarek@suse.cz +- make icewm --config=file work + (override-config.patch) * Mon Jan 28 2008 mmarek@suse.cz - updated to 1.2.35 * Application tray bug fixes ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.NR5291/_old 2008-01-30 02:49:39.000000000 +0100 +++ /var/tmp/diff_new_pack.NR5291/_new 2008-01-30 02:49:39.000000000 +0100 @@ -21,7 +21,7 @@ Requires: icewm-bin, xdg-menu, desktop-data AutoReqProv: on Version: 1.2.35 -Release: 1 +Release: 2 Source: icewm-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: icewm-LANG.menu.patch @@ -29,6 +29,7 @@ Patch2: icewm-menu.patch Patch3: icewm-docdir.patch Patch4: icewm-1.2.30-strict-aliasing.patch +Patch5: icewm-1.2.35-override-config.patch Url: http://www.icewm.org/ Summary: Window Manager with a Taskbar BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,6 +93,7 @@ %patch2 %patch3 %patch4 +%patch5 %build %{?suse_update_config:%{suse_update_config -f}} @@ -167,6 +169,9 @@ /usr/bin/icewm-menu-gnome2 %changelog +* Tue Jan 29 2008 mmarek@suse.cz +- make icewm --config=file work + (override-config.patch) * Mon Jan 28 2008 mmarek@suse.cz - updated to 1.2.35 * Application tray bug fixes ++++++ icewm-1.2.35-override-config.patch ++++++ make icewm --config=preferences.xy work, i.e. load /etc/icewm/preferences.xy --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -1136,7 +1136,7 @@ YWMApp::YWMApp(int *argc, char ***argv, managerWindow = None; #ifndef NO_CONFIGURE - loadConfiguration("preferences"); + loadConfiguration(configFile ? configFile : "preferences"); if (themeName != 0) { MSG(("themeName=%s", themeName)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org