SHA256
1
0
forked from pool/WindowMaker

Accepting request 122558 from home:computersalat:devel:X11wm

update to 0.95.3

OBS-URL: https://build.opensuse.org/request/show/122558
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=17
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2012-06-12 07:19:20 +00:00 committed by Git OBS Bridge
parent c355f800a7
commit 044a2675b2
6 changed files with 53 additions and 82 deletions

View File

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

View File

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

View File

@ -9,25 +9,7 @@ Index: WindowMaker/Defaults/WindowMaker.in
PopupSwitchMenu = NO;
MenuStyle = normal;
DisableMiniwindows = NO;
@@ -12,6 +13,8 @@
"~/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 @@
@@ -31,7 +32,7 @@
IconSize = 64;
FocusMode = manual;
DisableWSMouseActions = NO;

View File

@ -1213,14 +1213,14 @@ Index: WindowMaker/menu.hu
"Munkafelület" MENU
"Elrejtés" HIDE_OTHERS
"Mindent mutat" SHOW_ALL
@@ -204,14 +152,12 @@
@@ -204,14 +152,13 @@
"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:)"
"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
"Megjelenés" END
-
+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
"Kilépés" MENU
@ -2783,31 +2783,11 @@ Index: WindowMaker/plmenu.de
("Arbeitsfläche",
("Andere verbergen", HIDE_OTHERS),
("Alle zeigen", SHOW_ALL),
@@ -66,9 +16,9 @@
("Gespeicherte Sitzung löschen", CLEAR_SESSION)
@@ -94,12 +44,12 @@
),
("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)\""),
- ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/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)\"")
- ),
+ ("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")
+ ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
@ -3496,9 +3476,9 @@ Index: WindowMaker/plmenu.it
("Cancella Sessione salvata", CLEAR_SESSION)
),
("Visualizzazione",
- ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stili", OPEN_MENU, "-noext /usr/X11R6/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"),
- ("Temi", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stili", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- ("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"),
+ ("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"),
@ -3509,7 +3489,7 @@ Index: WindowMaker/plmenu.it
("Sfumature Grigie", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
("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")
),
("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 kwm", RESTART, kwm),
- ("Avvia IceWM", RESTART, icewm),
- ("Esci...", EXIT),
("Esci...", EXIT),
- ("Uccidi sessione...", SHUTDOWN)
+ ("Esci...", EXIT)
)
)
Index: WindowMaker/plmenu.ja

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

View File

@ -16,12 +16,11 @@
#
Name: WindowMaker
Summary: A Colorful and Flexible Window Manager
License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
Group: System/GUI/Other
Version: 0.95.2
Version: 0.95.3
Release: 0
Url: http://windowmaker.org/
Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2
@ -48,8 +47,8 @@ BuildRequires: libXft-devel
%endif
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
Provides: wmaker
Provides: windowmanager
Provides: wmaker
Requires: xdg-menu
%description
@ -100,6 +99,7 @@ rename no nb po/no.*
# ---------------------------------------------------------------------------
%build
./autogen.sh
#autoreconf --force --install
%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"
@ -166,6 +166,7 @@ cd ..
/usr/bin/*
%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_mandir}/man8/*
/usr/share/WINGs
/usr/share/%{name}
/usr/share/xsessions/*