commit WindowMaker for openSUSE:Factory

17 Apr 2014

Hello community,

here is the log from the commit of package WindowMaker for openSUSE:Factory checked in at 2014-04-17 14:09:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/WindowMaker (Old)
 and      /work/SRC/openSUSE:Factory/.WindowMaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "WindowMaker"

Changes:
--------

--- /work/SRC/openSUSE:Factory/WindowMaker/WindowMaker.changes	2013-09-27 19:29:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.WindowMaker.new/WindowMaker.changes	2014-04-17 14:09:54.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 10 20:57:27 UTC 2014 - sfalken@opensuse.org
+
+- Added --prefix=/usr and --datadir=/usr/share to %configure to
+  correct paths to better match with other WindowManagers in
+  openSUSE
+- Updated WindowMaker-menu.patch with corrected paths
+- Created patch to fix wmgenmenu to remove hardcodes in source
+  Add: fix_wmgenmenu_paths.patch 
+
+-------------------------------------------------------------------

New:
----
  fix_wmgenmenu_paths.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ WindowMaker.spec ++++++
--- /var/tmp/diff_new_pack.917hrF/_old	2014-04-17 14:09:55.000000000 +0200
+++ /var/tmp/diff_new_pack.917hrF/_new	2014-04-17 14:09:55.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package WindowMaker
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
 Source7:        %{name}-rpmlintrc
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-menu.patch
+Patch3:         fix_wmgenmenu_paths.patch
 #
 Patch101:       wm-giflib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -93,7 +94,8 @@
 mkdir menu_orig
 cp %{name}/{menu.*,plmenu.*} menu_orig
 %patch1
-%patch2
+%patch2 -p1
+%patch3 -p1
 %patch101
 cp %{S:4} .
 cp %{S:6} .
@@ -113,6 +115,8 @@
 %endif
 export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
 %configure \
+  --prefix=/usr \
+  --datadir=/usr/share \
   --disable-static \
   --with-pic\
   --sysconfdir=/etc/X11 \
@@ -125,6 +129,7 @@
 make %{?_smp_mflags}
 (cd %{name}-extra-0.1
 %configure \
+  --prefix=/usr \
   --disable-static \
   --with-pic\
   --with-pixmapdir=/usr/share/%{name}/Pixmaps

++++++ WindowMaker-menu.patch ++++++
++++ 1111 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/WindowMaker/WindowMaker-menu.patch
++++ and /work/SRC/openSUSE:Factory/.WindowMaker.new/WindowMaker-menu.patch

++++++ fix_wmgenmenu_paths.patch ++++++
...
From 3981805ec78adf4479f0988cfc2174a02d58a738 Mon Sep 17 00:00:00 2001
From: "Carlos R. Mafra" <crmafra@gmail.com>
Date: Thu, 10 Apr 2014 19:34:48 +0100
Subject: [PATCH] wmgenmenu: Write paths according to options set at configure
 time
As reported by Shawn W Dunn, the configuration strings written by wmgenmenu
in $HOME/GNUstep/Defaults/WMRootMenu were not reflecting his installation
directories choices.

Fix this by writing strings composed with PKGDATADIR.

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
---
diff -rupN WindowMaker-0.95.4.old/util/wmgenmenu.c WindowMaker-0.95.4/util/wmgenmenu.c
--- WindowMaker-0.95.4.old/util/wmgenmenu.c	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/util/wmgenmenu.c	2014-04-10 13:02:00.693514632 -0700
@@ -35,6 +35,13 @@ int main(int argc, char *argv[])
 {
 	char *t;
 	int ch;
+	char *tmp, *theme_paths, *style_paths, *icon_paths, *bg_paths;
+
+	tmp = wstrconcat("-noext ", PKGDATADIR);
+	theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
+	style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
+	icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
+	bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t");
 
 	struct option longopts[] = {
 		{ "version",		no_argument,	NULL,	'v' },
@@ -146,7 +153,7 @@ int main(int argc, char *argv[])
 	L2Menu = WMCreatePLArray(
 		WMCreatePLString(_("Themes")),
 		WMCreatePLString("OPEN_MENU"),
-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+		WMCreatePLString(theme_paths),
 		NULL
 	);
 	WMAddToPLArray(L1Menu, L2Menu);
@@ -155,7 +162,7 @@ int main(int argc, char *argv[])
 	L2Menu = WMCreatePLArray(
 		WMCreatePLString(_("Styles")),
 		WMCreatePLString("OPEN_MENU"),
-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+		WMCreatePLString(style_paths),
 		NULL
 	);
 	WMAddToPLArray(L1Menu, L2Menu);
@@ -164,7 +171,7 @@ int main(int argc, char *argv[])
 	L2Menu = WMCreatePLArray(
 		WMCreatePLString(_("Icon Sets")),
 		WMCreatePLString("OPEN_MENU"),
-		WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+		WMCreatePLString(icon_paths),
 		NULL
 	);
 	WMAddToPLArray(L1Menu, L2Menu);
@@ -232,7 +239,7 @@ int main(int argc, char *argv[])
 	L3Menu = WMCreatePLArray(
 		WMCreatePLString(_("Images")),
 		WMCreatePLString("OPEN_MENU"),
-		WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
+		WMCreatePLString(bg_paths),
 		NULL
 	);
 	WMAddToPLArray(L2Menu, L3Menu);
@@ -321,7 +328,7 @@ int main(int argc, char *argv[])
 	L1Menu = WMCreatePLArray(
 		WMCreatePLString(_("Configure Window Maker")),
 		WMCreatePLString("EXEC"),
-		WMCreatePLString("WPrefs"),
+		WMCreatePLString("/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"),
 		NULL
 	);
 	WMAddToPLArray(RMenu, L1Menu);
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)