This commit is contained in:
parent
3f63ac84ec
commit
46f4a073c9
@ -22,7 +22,14 @@ OpaqueMoveSize 100
|
||||
|
||||
|
||||
#paths specific to fvwm2
|
||||
# If you use X.org 7.0 or abow omit X11R6 from these two paths below.
|
||||
#
|
||||
# The difference between X.org 6.x and 7.x
|
||||
# If you switch to X.org version 7.0 or higher
|
||||
# you should change the paths bellow
|
||||
# /usr/X11R6/lib/X11/fvwm2 -> /usr/lib/X11/fvwm2
|
||||
# /usr/X11R6/lib/X11/fvwm2/pixmaps -> /usr/share/X11/fvwm2/pixmaps
|
||||
#
|
||||
# Check these paths in your system to be sure.
|
||||
|
||||
ModulePath /usr/X11R6/lib/X11/fvwm2
|
||||
ImagePath /usr/X11R6/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers
|
||||
@ -74,13 +81,13 @@ AddToFunc InitFunction
|
||||
+ "I" Module FvwmBanner
|
||||
+ "I" Exec xterm -ls -geometry +150+85
|
||||
+ "I" Module FvwmButtons
|
||||
+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg
|
||||
|
||||
AddToFunc RestartFunction
|
||||
+ "I" Module FvwmBanner
|
||||
+ "I" Module FvwmButtons
|
||||
+ "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg
|
||||
|
||||
AddToFunc ExitFunction
|
||||
+ "I" Exec xsetroot
|
||||
@ -122,10 +129,10 @@ AddToMenu barshellspopup "Shell in XTerm" Title
|
||||
+ "Shell in XTerm" Exec xterm -e bash -login
|
||||
+ "Root shell" Function RootShell
|
||||
|
||||
AddToMenu barsusepopup "SUSE" Title
|
||||
AddToMenu barsusepopup "openSUSE" Title
|
||||
+ "Control Center" Exec xterm -e su - -c yast2
|
||||
+ "Help" Exec susehelp
|
||||
+ "SUSE menu" Popup xdg_menu
|
||||
+ "openSUSE menu" Popup xdg_menu
|
||||
|
||||
|
||||
AddToFunc RootShell
|
||||
@ -296,7 +303,7 @@ AddToMenu WORK_MENU_popup "Work Menu" Title
|
||||
+ "Screen" Popup screen_popup
|
||||
+ "Settings" Popup settings_popup
|
||||
+ "WindowManager" Popup THISWM_MENU_popup
|
||||
+ "SUSE" Popup xdg_menu
|
||||
+ "openSUSE" Popup xdg_menu
|
||||
|
||||
Style "FvwmPager" NoTitle, Sticky, WindowListSkip
|
||||
*FvwmPagerRows 1
|
||||
@ -332,7 +339,7 @@ AddToFunc barshellspopupfunc
|
||||
*FvwmButtons: (Swallow FvwmXeyes 'Exec xeyes -name "FvwmXeyes" -geometry +0+0 -bg grey67 &')
|
||||
*FvwmButtons: (Swallow FvwmXclock 'Exec xclock -name "FvwmXclock" -geometry +0+0 -padding 1 -bg rgb:91/ae/d6 &')
|
||||
*FvwmButtons Fvwm2 fvwm.xpm Function barthiswmpopupfunc
|
||||
*FvwmButtons SUSE big.SuSEmenu.xpm Function barsusepopupfunc
|
||||
*FvwmButtons openSUSE openSuSE.xpm Function barsusepopupfunc
|
||||
*FvwmButtons Graphics gimp.xpm Function bargraphicspopupfunc
|
||||
*FvwmButtons Tools toolbox.xpm Function bartoolspopupfunc
|
||||
*FvwmButtons Shells xterm.xpm Function barshellspopupfunc
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- bin/fvwm-menu-directory.in
|
||||
+++ bin/fvwm-menu-directory.in
|
||||
@@ -279,7 +279,7 @@
|
||||
my $itemStr = $dir && $itemF_eval? &evalItem($_name, $dir): $_name;
|
||||
$itemStr = escapeItemName($itemStr);
|
||||
my $act = !$dir || $checkSubdirs && !-x $dir? "Nop": !$reuse?
|
||||
- qq(Popup ") . escapeFvwmName($dir) . qq("$submenuPos):
|
||||
+ qq(Popup ") . escapeFileName($dir) . qq("$submenuPos):
|
||||
qq(PipeRead 'echo ") . escapeFileName($dir) . qq(" >$dirFile; )
|
||||
. qq(echo Menu ") . escapeFvwmName($name) . qq(" WarpTitle');
|
||||
return qq(+ "$iconDStr$itemStr" $act\n);
|
3
fvwm-2.5.20.tar.bz2
Normal file
3
fvwm-2.5.20.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94c96b3f5fb061243f8f415a2111c5893e3fa49db27f0bdb90ab0584e0725e4a
|
||||
size 1995268
|
@ -1,6 +1,6 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -81,7 +81,7 @@
|
||||
@@ -82,7 +82,7 @@
|
||||
[if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
|
||||
fi], [])
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a0fef63538879dc51da79170c3da6281c0f55f7a1a42bd74912d2a328c537aa
|
||||
size 1976786
|
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 16 18:13:49 CET 2007 - lmichnovic@suse.cz
|
||||
|
||||
- fixed wrong path for icons in system.fvwm2rc [#223521]
|
||||
- changed titles to openSUSE
|
||||
- created openSuSE.xpm icon for Button bar menu
|
||||
- spec cleanup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 15 21:03:22 CET 2007 - lmichnovic@suse.cz
|
||||
|
||||
- update to 2.5.20
|
||||
- many bug fixes
|
||||
- fixed few memory leaks
|
||||
- some new functions and features:
|
||||
* "Mouse n M N" is no longer used to disable or remap the
|
||||
builtin tear off menu button. See the section Tear Off Menus.
|
||||
* Full support for menu context (M) key and mouse bindings.
|
||||
* New window conditions: StickyIcon, StickyAcrossPagesIcon
|
||||
and StickyAcrossDesksIcon.
|
||||
* Hilighted menu backgrounds now use pixmaps gradients and
|
||||
transparency from their related colorset.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 5 18:10:37 CET 2007 - lmichnovic@suse.cz
|
||||
|
||||
- fixed missing background image [#223521]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 20:00:44 CET 2006 - lmichnovic@suse.cz
|
||||
|
||||
|
35
fvwm2.spec
35
fvwm2.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fvwm2 (Version 2.5.19)
|
||||
# spec file for package fvwm2 (Version 2.5.20)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -17,21 +17,21 @@ Group: System/GUI/Other
|
||||
Provides: fvwmicns windowmanager xpmroot
|
||||
Obsoletes: fvwm xpmroot
|
||||
Autoreqprov: on
|
||||
Version: 2.5.19
|
||||
Release: 6
|
||||
Version: 2.5.20
|
||||
Release: 1
|
||||
Summary: Improved Version of FVWM Window Manager
|
||||
URL: http://www.fvwm.org
|
||||
Source0: fvwm-snap-20061212.tar.bz2
|
||||
Source0: fvwm-2.5.20.tar.bz2
|
||||
Source1: fvwm_icons.tar.bz2
|
||||
Source3: %name.desktop
|
||||
Source4: system.fvwm2rc
|
||||
Source5: _system.fvwm2rc
|
||||
Source6: openSuSE.xpm
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: xdg-menu, desktop-data, mktemp, xli, xorg-x11
|
||||
Patch0: fvwm-configure.patch
|
||||
Patch1: fvwm-%{version}-gcc-warnings.patch
|
||||
Patch2: fvwm-%{version}-ia64.patch
|
||||
Patch3: fvwm-%{version}-sec-fvwmname.patch
|
||||
|
||||
%description
|
||||
FVWM is a virtual desktop window manager for the X Window System.
|
||||
@ -46,7 +46,6 @@ Authors:
|
||||
--------
|
||||
The fvwm developers <fvwm-workers@fvwm.org>
|
||||
|
||||
%define kermit seyon-kermit-1.0
|
||||
%if "%(xft-config --prefix)" == "/usr"
|
||||
%define _xorg7libs %_lib
|
||||
%define _xorg7bin bin
|
||||
@ -63,12 +62,13 @@ Authors:
|
||||
%define _xorg7mandir /usr/X11R6/man
|
||||
%endif
|
||||
%prep
|
||||
%setup -q -n fvwm-snap-20061212
|
||||
%setup -q -n fvwm-2.5.20
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
mkdir icons
|
||||
tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
|
||||
cp %{S:6} icons
|
||||
#
|
||||
# build
|
||||
|
||||
@ -162,6 +162,25 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog -n fvwm2
|
||||
* Tue Jan 16 2007 - lmichnovic@suse.cz
|
||||
- fixed wrong path for icons in system.fvwm2rc [#223521]
|
||||
- changed titles to openSUSE
|
||||
- created openSuSE.xpm icon for Button bar menu
|
||||
- spec cleanup
|
||||
* Mon Jan 15 2007 - lmichnovic@suse.cz
|
||||
- update to 2.5.20
|
||||
- many bug fixes
|
||||
- fixed few memory leaks
|
||||
- some new functions and features:
|
||||
* "Mouse n M N" is no longer used to disable or remap the
|
||||
builtin tear off menu button. See the section Tear Off Menus.
|
||||
* Full support for menu context (M) key and mouse bindings.
|
||||
* New window conditions: StickyIcon, StickyAcrossPagesIcon
|
||||
and StickyAcrossDesksIcon.
|
||||
* Hilighted menu backgrounds now use pixmaps gradients and
|
||||
transparency from their related colorset.
|
||||
* Fri Jan 05 2007 - lmichnovic@suse.cz
|
||||
- fixed missing background image [#223521]
|
||||
* Tue Dec 19 2006 - lmichnovic@suse.cz
|
||||
- added xorg-x11 into Requires and Buildrequires and excluding
|
||||
/usr/share/xsessions directory from filelist [#229172]
|
||||
|
39
openSuSE.xpm
Normal file
39
openSuSE.xpm
Normal file
@ -0,0 +1,39 @@
|
||||
/* XPM */
|
||||
static char * openSuSE1_xpm[] = {
|
||||
"51 34 2 1",
|
||||
" c None",
|
||||
". c #084404",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ........ ",
|
||||
" ................. .... ",
|
||||
" .............................. ",
|
||||
" ............................ . ",
|
||||
" ............................. ..... ",
|
||||
" ............................... . . . ",
|
||||
" ................................ ... . ",
|
||||
" .............................. ... ... ",
|
||||
" ............................... ...... ",
|
||||
" .................................. ",
|
||||
" ..... ................................ ",
|
||||
" .... ............................ ",
|
||||
" .... ..... ................. ",
|
||||
" ... ....... ..... ..... ",
|
||||
" ... .. ... ... .... ",
|
||||
" ... .. .. ... .... ",
|
||||
" ... .... .. ... ... ",
|
||||
" ... ... .. . . ",
|
||||
" .... ... ",
|
||||
" .......... ",
|
||||
" ........ ",
|
||||
" ... ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
@ -22,11 +22,14 @@ OpaqueMoveSize 100
|
||||
|
||||
|
||||
#paths specific to fvwm2
|
||||
# if you use X.org 6.9 or below change these two paths below
|
||||
# to /usr/X11R6/lib...
|
||||
#
|
||||
# The difference between X.org 6.x and 7.x
|
||||
# If you switch to X.org version 6.9 or below change the paths below
|
||||
# /usr/lib/X11/fvwm2 -> /usr/X11R6/lib...
|
||||
# /usr/share/X11/fvwm2 -> /usr/X11R6/lib/X11/fvwm2/pixmaps
|
||||
|
||||
ModulePath /usr/lib/X11/fvwm2
|
||||
ImagePath /usr/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers
|
||||
ImagePath /usr/share/X11/fvwm2/pixmaps:/usr/share/wallpapers
|
||||
|
||||
|
||||
#colors
|
||||
@ -75,13 +78,13 @@ AddToFunc InitFunction
|
||||
+ "I" Module FvwmBanner
|
||||
+ "I" Exec xterm -ls -geometry +150+85
|
||||
+ "I" Module FvwmButtons
|
||||
+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg
|
||||
|
||||
AddToFunc RestartFunction
|
||||
+ "I" Module FvwmBanner
|
||||
+ "I" Module FvwmButtons
|
||||
+ "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png
|
||||
+ "I" Exec xli -onroot -fillscreen -border black /usr/share/wallpapers/default-1600x1200.jpg
|
||||
|
||||
AddToFunc ExitFunction
|
||||
+ "I" Exec xsetroot
|
||||
@ -123,10 +126,10 @@ AddToMenu barshellspopup "Shell in XTerm" Title
|
||||
+ "Shell in XTerm" Exec xterm -e bash -login
|
||||
+ "Root shell" Function RootShell
|
||||
|
||||
AddToMenu barsusepopup "SUSE" Title
|
||||
AddToMenu barsusepopup "openSUSE" Title
|
||||
+ "Control Center" Exec xterm -e su - -c yast2
|
||||
+ "Help" Exec susehelp
|
||||
+ "SUSE menu" Popup xdg_menu
|
||||
+ "openSUSE menu" Popup xdg_menu
|
||||
|
||||
|
||||
AddToFunc RootShell
|
||||
@ -297,7 +300,7 @@ AddToMenu WORK_MENU_popup "Work Menu" Title
|
||||
+ "Screen" Popup screen_popup
|
||||
+ "Settings" Popup settings_popup
|
||||
+ "WindowManager" Popup THISWM_MENU_popup
|
||||
+ "SUSE" Popup xdg_menu
|
||||
+ "openSUSE" Popup xdg_menu
|
||||
|
||||
Style "FvwmPager" NoTitle, Sticky, WindowListSkip
|
||||
*FvwmPagerRows 1
|
||||
@ -333,7 +336,7 @@ AddToFunc barshellspopupfunc
|
||||
*FvwmButtons: (Swallow FvwmXeyes 'Exec xeyes -name "FvwmXeyes" -geometry +0+0 -bg grey67 &')
|
||||
*FvwmButtons: (Swallow FvwmXclock 'Exec xclock -name "FvwmXclock" -geometry +0+0 -padding 1 -bg rgb:91/ae/d6 &')
|
||||
*FvwmButtons Fvwm2 fvwm.xpm Function barthiswmpopupfunc
|
||||
*FvwmButtons SUSE big.SuSEmenu.xpm Function barsusepopupfunc
|
||||
*FvwmButtons openSUSE openSuSE.xpm Function barsusepopupfunc
|
||||
*FvwmButtons Graphics gimp.xpm Function bargraphicspopupfunc
|
||||
*FvwmButtons Tools toolbox.xpm Function bartoolspopupfunc
|
||||
*FvwmButtons Shells xterm.xpm Function barshellspopupfunc
|
||||
|
Loading…
Reference in New Issue
Block a user