rpms/WindowMaker/devel WindowMaker-0.91.0-alt-clipnotext.patch, 1.1, 1.2 WindowMaker-0.91.0-alt-menutrans.patch, 1.1, 1.2 WindowMaker-0.91.0-wmcontrib-singleclick.patch, 1.1, 1.2 WindowMaker.spec, 1.27, 1.28

Tom Callaway spot at fedoraproject.org
Thu Sep 25 00:58:18 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/WindowMaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv791

Modified Files:
	WindowMaker-0.91.0-alt-clipnotext.patch 
	WindowMaker-0.91.0-alt-menutrans.patch 
	WindowMaker-0.91.0-wmcontrib-singleclick.patch 
	WindowMaker.spec 
Log Message:
fix patches to apply without fuzz

WindowMaker-0.91.0-alt-clipnotext.patch:

Index: WindowMaker-0.91.0-alt-clipnotext.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-alt-clipnotext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-alt-clipnotext.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-alt-clipnotext.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -24,11 +24,11 @@
      {"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL,
      NULL,				getFont,	setLargeDisplayFont
      },
---- WindowMaker-0.91.0/src/WindowMaker.h.vns	2005-05-18 16:29:46 +0400
-+++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-18 16:29:46 +0400
-@@ -490,6 +490,8 @@
-     /* single click to lauch applications */
-     char single_click;
+--- WindowMaker-0.92.0/src/WindowMaker.h.orig	2008-09-24 20:48:19.000000000 -0400
++++ WindowMaker-0.92.0/src/WindowMaker.h	2008-09-24 20:49:47.000000000 -0400
+@@ -481,6 +481,8 @@
+     RImage *swtileImage;
+     RImage *swbackImage[9];
  
 +    int show_clip_title;
 +

WindowMaker-0.91.0-alt-menutrans.patch:

Index: WindowMaker-0.91.0-alt-menutrans.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-alt-menutrans.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-alt-menutrans.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-alt-menutrans.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -88,18 +88,6 @@
                           shortcut ? WMGetFromPLString(shortcut) : NULL,
                           WMGetFromPLString(command),
                           params ? WMGetFromPLString(params) : NULL, "WMRootMenu");
---- WindowMaker-0.91.0/src/defaults.c.vns	2005-05-18 14:12:23 +0400
-+++ WindowMaker-0.91.0/src/defaults.c	2005-05-18 14:12:23 +0400
-@@ -556,6 +556,9 @@
-     {"SingleClickLaunch",	"NO",	NULL,
-     &wPreferences.single_click,	getBool,	NULL
-     },
-+    {"TranslateMenu",	"YES",		NULL,
-+    &wPreferences.translate_menu,	getBool,	NULL
-+    },
-     /* style options */
-     {"MenuStyle", 	"normal",  		seMenuStyles,
-     &wPreferences.menu_style, getEnum, 	setMenuStyle
 --- WindowMaker-0.91.0/src/WindowMaker.h.vns	2005-05-18 14:12:23 +0400
 +++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-18 14:12:23 +0400
 @@ -466,6 +466,8 @@
@@ -165,3 +153,15 @@
      textdomain("WindowMaker");
  
      if (!XSupportsLocale()) {
+--- WindowMaker-0.92.0/src/defaults.c.orig	2005-04-08 06:59:16.000000000 -0400
++++ WindowMaker-0.92.0/src/defaults.c	2008-09-24 20:47:32.000000000 -0400
+@@ -553,6 +553,9 @@
+     {"DisableBlinking",	"NO",		NULL,
+     &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"TranslateMenu",	"YES",		NULL,
++    &wPreferences.translate_menu,	getBool,	NULL
++    },
+     /* style options */
+     {"MenuStyle", 	"normal",  		seMenuStyles,
+     &wPreferences.menu_style, getEnum, 	setMenuStyle

WindowMaker-0.91.0-wmcontrib-singleclick.patch:

Index: WindowMaker-0.91.0-wmcontrib-singleclick.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker-0.91.0-wmcontrib-singleclick.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-wmcontrib-singleclick.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-wmcontrib-singleclick.patch	25 Sep 2008 00:57:48 -0000	1.2
@@ -26,30 +26,6 @@
              done = 1;
              break;
          }
---- WindowMaker-0.91.0/src/WindowMaker.h.sc	2004-10-25 05:48:39 +0400
-+++ WindowMaker-0.91.0/src/WindowMaker.h	2005-05-17 23:37:26 +0400
-@@ -475,6 +475,9 @@
-     RImage *swtileImage;
-     RImage *swbackImage[9];
- 
-+    /* single click to lauch applications */
-+    char single_click;
-+
-     struct {
-         unsigned int nodock:1;	       /* don't display the dock */
-         unsigned int noclip:1;         /* don't display the clip */
---- WindowMaker-0.91.0/src/defaults.c.sc	2005-05-17 23:37:09 +0400
-+++ WindowMaker-0.91.0/src/defaults.c	2005-05-17 23:37:26 +0400
-@@ -553,6 +553,9 @@
-     {"DisableBlinking",	"NO",		NULL,
-     &wPreferences.dont_blink,	getBool,	NULL
-     },
-+    {"SingleClickLaunch",	"NO",	NULL,
-+    &wPreferences.single_click,	getBool,	NULL
-+    },
-     /* style options */
-     {"MenuStyle", 	"normal",  		seMenuStyles,
-     &wPreferences.menu_style, getEnum, 	setMenuStyle
 --- WindowMaker-0.91.0/src/dock.c.sc	2004-10-23 07:10:40 +0400
 +++ WindowMaker-0.91.0/src/dock.c	2005-05-17 23:37:26 +0400
 @@ -3758,7 +3758,7 @@
@@ -166,3 +142,27 @@
  }
  
  
+--- WindowMaker-0.92.0/src/defaults.c.orig	2008-09-24 20:51:16.000000000 -0400
++++ WindowMaker-0.92.0/src/defaults.c	2008-09-24 20:53:20.000000000 -0400
+@@ -555,6 +555,9 @@
+     {"DisableBlinking",	"NO",		NULL,
+     &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"SingleClickLaunch",	"NO",	NULL,
++    &wPreferences.single_click,		getBool,	NULL
++    },
+     {"TranslateMenu",	"YES",		NULL,
+     &wPreferences.translate_menu,	getBool,	NULL
+     },
+--- WindowMaker-0.92.0/src/WindowMaker.h.orig	2008-09-24 20:51:16.000000000 -0400
++++ WindowMaker-0.92.0/src/WindowMaker.h	2008-09-24 20:52:01.000000000 -0400
+@@ -481,6 +481,9 @@
+     RImage *swtileImage;
+     RImage *swbackImage[9];
+ 
++    /* single click to lauch applications */
++    char single_click;
++
+     int show_clip_title;
+ 
+     struct {


Index: WindowMaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- WindowMaker.spec	11 Feb 2008 15:58:43 -0000	1.27
+++ WindowMaker.spec	25 Sep 2008 00:57:48 -0000	1.28
@@ -1,12 +1,12 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 
 License:	GPLv2+
 Group:		User Interface/Desktops
-URL:		http://www.windowmaker.org/
-Source0:	ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2
+URL:		http://www.windowmaker.info/
+Source0:	ftp://windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.bz2
 Source2:        WindowMaker.desktop
 Source3:	WindowMaker-uk.po
 Source4:	WPrefs-uk.po
@@ -260,6 +260,10 @@
 %{_includedir}/wraster.h
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.92.0-18
+- fix patches to apply without fuzz
+- adjust URL/Source to new website
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.92.0-17
 - Rebuilt for gcc43
 




More information about the fedora-extras-commits mailing list