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

2008-01-30 01:51:00 +00:00 · 2008-01-30 01:51:00 +00:00 · 1cc9b86aa4
commit 1cc9b86aa4
parent 15fea51318
5 changed files with 40 additions and 2 deletions
--- a/icewm-1.2.35-override-config.patch
+++ b/icewm-1.2.35-override-config.patch
@ -0,0 +1,16 @@
+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));
+ 
--- a/icewm-lite.changes
+++ b/icewm-lite.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 29 14:34:44 CET 2008 - mmarek@suse.cz
+
+- make icewm --config=file work
+  (override-config.patch)
+
 -------------------------------------------------------------------
 Mon Jan 28 10:23:43 CET 2008 - mmarek@suse.cz

--- a/icewm-lite.spec
+++ b/icewm-lite.spec
@ -19,13 +19,14 @@ Requires:       icewm
 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 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5

 %build
 %{?suse_update_config:%{suse_update_config -f}}
@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT;
 /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
--- a/icewm.changes
+++ b/icewm.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 29 14:34:44 CET 2008 - mmarek@suse.cz
+
+- make icewm --config=file work
+  (override-config.patch)
+
 -------------------------------------------------------------------
 Mon Jan 28 10:23:43 CET 2008 - mmarek@suse.cz

--- a/icewm.spec
+++ b/icewm.spec
@ -21,7 +21,7 @@ Provides:       windowmanager
 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 @@ 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 a Taskbar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -92,6 +93,7 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5

 %build
 %{?suse_update_config:%{suse_update_config -f}}
@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT;
 /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