From 12a72b90c74a45f013b2e9f288ac5049f60e1600 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Oct 14 2014 12:03:50 +0000 Subject: 0.95.6-2 - make system config in /etc noreplace - add fedora specific WMRootMenu in /etc - set current fedora background as default background (via desktop-backgrounds-compat) - fix bogus date in changelog - utf8 cleanup --- diff --git a/WindowMaker-WMRootMenu-fedora b/WindowMaker-WMRootMenu-fedora new file mode 100644 index 0000000..eb699ca --- /dev/null +++ b/WindowMaker-WMRootMenu-fedora @@ -0,0 +1,64 @@ +("Applications", + ("Info", + ("Info Panel", INFO_PANEL), + ("Legal", LEGAL_PANEL), + ), + ("Run...", SHEXEC, "%a(Run,Type command to run:)"), + ("Workspaces", WORKSPACE_MENU), + ( + Applications, + OPEN_PLMENU, + "|| find /usr/share/applications -type f -name '*.desktop' | xargs wmmenugen -parser:xdg" + ), + ( + Desktop, + OPEN_PLMENU, + "|| find ~/Desktop -type f -name '*.desktop' | xargs wmmenugen -parser:xdg" + ), + ("Selection", + ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)") + ), + ("Commands", + ("Hide Others", HIDE_OTHERS), + ("Show All", SHOW_ALL), + ("Arrange Icons", ARRANGE_ICONS), + ("Refresh", REFRESH), + ), + ("Appearance", + ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), + ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"), + ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"), + ("Background", + ("Solid", + ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), + ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"), + ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"), + ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"), + ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"), + ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"), + ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), + ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") + ), + ("Gradient", + ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"), + ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"), + ("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"), + ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"), + ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"), + ("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"), + ("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), + ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") + ), + ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") + ), + ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), + ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), + ("Preferences Utility", EXEC, "/usr/bin/WPrefs") + ), + ("Session", + ("Save Session", SAVE_SESSION), + ("Clear Session", CLEAR_SESSION), + ("Restart Window Maker", RESTART), + ("Exit", EXIT) + ) +) diff --git a/WindowMaker.spec b/WindowMaker.spec index dcf55bc..30efda6 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.95.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://www.windowmaker.org @@ -12,6 +12,8 @@ Source2: WindowMaker-application.desktop Source3: WindowMaker-uk.po Source4: WPrefs-uk.po +Source5: WindowMaker-WMRootMenu-fedora + # fix Workspace background pref can be tricked to run arbitrary cmds # http://repo.or.cz/w/wmaker-crm.git/commit/e11199d9cf45efcd52505da90c5430646de4ea26 Patch0: WindowMaker-fix-wmsetbg-injection.patch @@ -53,11 +55,12 @@ BuildRequires: automake autoconf libtool BuildRequires: chrpath Requires: WINGs-libs = %{version}-%{release} +Requires: desktop-backgrounds-compat %description Window Maker is an X11 window manager designed to give additional integration support to the GNUstep Desktop Environment. In every way -possible, it reproduces the elegant look and feel of the nextstep GUI. +possible, it reproduces the elegant look and feel of the NEXTSTEP GUI. It is fast, feature rich, easy to configure, and easy to use. In addition, Window Maker works with GNOME and KDE, making it one of the most useful and universal window managers available. @@ -134,6 +137,17 @@ echo $i sed -i.old -e 's:/usr/local/:%{_prefix}/:g' $i done +# fix utf8 issues +iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog + +for i in doc/cs/geticonset.1x doc/cs/seticons.1x doc/cs/wdwrite.1x doc/cs/wmaker.1x \ + doc/cs/wmsetbg.1x doc doc/cs/wxcopy.1x doc/cs/wxpaste.1x doc/sk/geticonset.1x \ + doc/sk/seticons.1x doc/sk/wdwrite.1x doc/sk/wmaker.1x doc/sk/wmsetbg.1x \ + doc/sk/wxcopy.1x doc/sk/wxpaste.1x; do +echo $i +iconv -f iso8859-1 -t utf-8 $i > $i.conv && mv -f $i.conv $i +done + autoreconf -vfi -I m4 %build @@ -165,6 +179,13 @@ install -D -m0644 -p %{SOURCE1} \ install -D -m0644 -p %{SOURCE2} \ %{buildroot}%{_datadir}/applications/WindowMaker.desktop +# make first login fedora specific +install -D -m0644 -p %{SOURCE5} \ +%{buildroot}%{_sysconfdir}/WindowMaker/WMRootMenu +sed -i \ + -e 's:WorkspaceBack = (solid:WorkspaceBack = (mpixmap, "/usr/share/backgrounds/default.png":' \ + %{buildroot}%{_sysconfdir}/WindowMaker/WindowMaker + find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' chmod 755 %{buildroot}%{_datadir}/WindowMaker/{autostart.sh,exitscript.sh} @@ -192,7 +213,8 @@ rm -rf $RPM_BUILD_ROOT %files -f '\(WPrefs\|WindowMaker\|WINGs\|wmgenmenu\)'.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* -%config %{_sysconfdir}/WindowMaker/ +%dir %{_sysconfdir}/WindowMaker +%config(noreplace) %{_sysconfdir}/WindowMaker/* %{_bindir}/wmaker %{_bindir}/wdwrite %{_bindir}/wdread @@ -320,6 +342,14 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Oct 14 2014 Andreas Bierfert +- 0.95.6-2 +- make system config in /etc noreplace +- add fedora specific WMRootMenu in /etc +- set current fedora background as default background (via desktop-backgrounds-compat) +- fix bogus date in changelog +- utf8 cleanup + +* Tue Oct 14 2014 Andreas Bierfert - 0.95.6-1 - version upgrade (rhbz#1138296) @@ -502,7 +532,7 @@ rm -rf $RPM_BUILD_ROOT 0.91.0-1 - upgrade to 0.91.0 -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Fri Nov 28 2003 Dams - 0:0.80.2-0.fdr.6