rpm/WindowMaker
SHA256
1
0
Fork 0
forked from pool/WindowMaker
Code Pull Requests Activity

Accepting request 124635 from X11:windowmanagers

Browse Source 
update to 0.95.3 (forwarded request 122558 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/124635
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=26
This commit is contained in:
Stephan Kulow 2012-06-15 13:11:16 +00:00 committed by Git OBS Bridge
commit 99805ae204
6 changed files with 53 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WindowMaker-0.95.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b
size 2190825

3
WindowMaker-0.95.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b239e2531b7509cdebe0162e3c2f6fc8ca9c6bbef00e1bf7eb6e3e9aaf95a329
size 2207148

20
WindowMaker-config.patch
View File

@ -9,25 +9,7 @@ Index: WindowMaker/Defaults/WindowMaker.in
PopupSwitchMenu = NO; PopupSwitchMenu = NO;
MenuStyle = normal; MenuStyle = normal;
DisableMiniwindows = NO; DisableMiniwindows = NO;
@@ -12,6 +13,8 @@ @@ -31,7 +32,7 @@
"~/GNUstep/Library/Icons",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
+ "/usr/X11R6/share/icons/png/hicolor/all",
+ "/usr/X11R6/share/icons/png/locolor/all",
"/usr/X11R6/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
"/usr/share/icons",
@@ -23,6 +26,8 @@
"~/GNUstep/Library/WindowMaker/Backgrounds",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
+ "/usr/X11R6/share/icons/png/hicolor/all",
+ "/usr/X11R6/share/icons/png/locolor/all",
"/usr/X11R6/include/X11/pixmaps",
"/usr/local/share/pixmaps",
"/usr/share/pixmaps"
@@ -31,7 +36,7 @@
IconSize = 64; IconSize = 64;
FocusMode = manual; FocusMode = manual;
DisableWSMouseActions = NO; DisableWSMouseActions = NO;

47
WindowMaker-menu.patch
View File

@ -1213,16 +1213,16 @@ Index: WindowMaker/menu.hu
"Munkafelület" MENU "Munkafelület" MENU
"Elrejtés" HIDE_OTHERS "Elrejtés" HIDE_OTHERS
"Mindent mutat" SHOW_ALL "Mindent mutat" SHOW_ALL
@@ -204,14 +152,12 @@ @@ -204,14 +152,13 @@
"Háttér" END "Háttér" END
"Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)" "Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
"Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)" "Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
- "Konfiguráló program" EXEC /usr/X11R6/bin/WPrefs - "Konfiguráló program" EXEC /usr/bin/WPrefs
+ "Konfiguráló program" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs + "Konfiguráló program" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
"Megjelenés" END "Megjelenés" END
-
+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps + "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" + "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
"Kilépés" MENU "Kilépés" MENU
"Újraindítás" RESTART "Újraindítás" RESTART
- "BlackBox indítása" RESTART blackbox - "BlackBox indítása" RESTART blackbox
@ -2783,31 +2783,11 @@ Index: WindowMaker/plmenu.de
("Arbeitsfläche", ("Arbeitsfläche",
("Andere verbergen", HIDE_OTHERS), ("Andere verbergen", HIDE_OTHERS),
("Alle zeigen", SHOW_ALL), ("Alle zeigen", SHOW_ALL),
@@ -66,9 +16,9 @@ @@ -94,12 +44,12 @@
("Gespeicherte Sitzung löschen", CLEAR_SESSION)
),
("Erscheinungsbild",
- ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes /home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles /home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ ("Themen", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ ("Stile", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ ("Iconsätze", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Hintergrund",
("Einfarbig",
("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,16 +40,16 @@
("Grau schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Weinfarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
),
- ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds /home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+ ("Bilder", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
), ),
- ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""), ("Thema speichern", SHEXEC, "getstyle -t $(HOME)/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
- ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"") ("Iconsatz speichern", SHEXEC, "geticonset $(HOME)/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
- ), - ),
+ ("Thema speichern", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
+ ("Iconsatz speichern", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\""),
+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") + ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+ ), + ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
@ -3496,9 +3476,9 @@ Index: WindowMaker/plmenu.it
("Cancella Sessione salvata", CLEAR_SESSION) ("Cancella Sessione salvata", CLEAR_SESSION)
), ),
("Visualizzazione", ("Visualizzazione",
- ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), - ("Temi", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stili", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), - ("Stili", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- ("Set di Icone", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"), - ("Set di Icone", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ ("Temi", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), + ("Temi", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ ("Stili", OPEN_MENU, "-noext #wmdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), + ("Stili", OPEN_MENU, "-noext #wmdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"), + ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
@ -3509,7 +3489,7 @@ Index: WindowMaker/plmenu.it
("Sfumature Grigie", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), ("Sfumature Grigie", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("Sfumature Vinaccia", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") ("Sfumature Vinaccia", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
), ),
- ("Immagini", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") - ("Immagini", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+ ("Immagini", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") + ("Immagini", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
), ),
("Salva il tema", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""), ("Salva il tema", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""),
@ -3525,9 +3505,8 @@ Index: WindowMaker/plmenu.it
- ("Avvia BlackBox", RESTART, blackbox), - ("Avvia BlackBox", RESTART, blackbox),
- ("Avvia kwm", RESTART, kwm), - ("Avvia kwm", RESTART, kwm),
- ("Avvia IceWM", RESTART, icewm), - ("Avvia IceWM", RESTART, icewm),
- ("Esci...", EXIT), ("Esci...", EXIT),
- ("Uccidi sessione...", SHUTDOWN) - ("Uccidi sessione...", SHUTDOWN)
+ ("Esci...", EXIT)
) )
) )
Index: WindowMaker/plmenu.ja Index: WindowMaker/plmenu.ja

9
WindowMaker.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri May 25 08:44:59 UTC 2012 - chris@computersalat.de
- update to 0.95.3
* no up-to-date ChangeLog available
see http://repo.or.cz/w/wmaker-crm.git/shortlog
- rebase patches
* config, menu
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 17 23:01:00 UTC 2012 - chris@computersalat.de Fri Feb 17 23:01:00 UTC 2012 - chris@computersalat.de

7
WindowMaker.spec
View File

@ -16,12 +16,11 @@
# #
Name: WindowMaker Name: WindowMaker
Summary: A Colorful and Flexible Window Manager Summary: A Colorful and Flexible Window Manager
License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
Group: System/GUI/Other Group: System/GUI/Other
Version: 0.95.2 Version: 0.95.3
Release: 0 Release: 0
Url: http://windowmaker.org/ Url: http://windowmaker.org/
Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2 Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
@ -48,8 +47,8 @@ BuildRequires: libXft-devel
%endif %endif
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
Provides: wmaker
Provides: windowmanager Provides: windowmanager
Provides: wmaker
Requires: xdg-menu Requires: xdg-menu
%description %description
@ -100,6 +99,7 @@ rename no nb po/no.*
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
%build %build
./autogen.sh
#autoreconf --force --install #autoreconf --force --install
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
@ -166,6 +166,7 @@ cd ..
/usr/bin/* /usr/bin/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man8/*
/usr/share/WINGs /usr/share/WINGs
/usr/share/%{name} /usr/share/%{name}
/usr/share/xsessions/* /usr/share/xsessions/*