From e4c741b0aa3fa1259a040b82e5c860682f1c161b Mon Sep 17 00:00:00 2001 From: Germán A. Racca Date: Jun 23 2010 22:06:30 +0000 Subject: - Fixed BuildRequires to compile from scratch --- diff --git a/.cvsignore b/.cvsignore index 878041e..8a19b2b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pekwm-0.1.5.tar.bz2 +pekwm-0.1.12.tar.gz diff --git a/pekwm-0.1.5-gcc43.patch b/pekwm-0.1.5-gcc43.patch deleted file mode 100644 index a4d3f9d..0000000 --- a/pekwm-0.1.5-gcc43.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- pekwm-0.1.5.orig/src/CfgParser.hh 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/CfgParser.hh 2008-09-17 10:04:40.000000000 -0500 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - //! @brief Configuration file parser. - class CfgParser { ---- pekwm-0.1.5.orig/src/Util.hh 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/Util.hh 2008-09-17 10:08:59.000000000 -0500 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - //! @brief Namespace Util used for various small file/string tasks. - namespace Util { ---- pekwm-0.1.5.orig/src/CfgParserKey.cc 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/CfgParserKey.cc 2008-09-17 10:08:50.000000000 -0500 -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - using std::string; - using std::cerr; ---- pekwm-0.1.5.orig/src/CfgParserSource.cc 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/CfgParserSource.cc 2008-09-17 10:10:34.000000000 -0500 -@@ -14,6 +14,7 @@ - #include "Util.hh" - - #include -+#include - - extern "C" { - #include ---- pekwm-0.1.5.orig/src/ColorHandler.hh 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/ColorHandler.hh 2008-09-17 10:11:40.000000000 -0500 -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - class ColorHandler { - public: ---- pekwm-0.1.5.orig/src/Util.cc 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/Util.cc 2008-09-17 10:14:09.000000000 -0500 -@@ -14,6 +14,7 @@ - #include "Util.hh" - #include - #include -+#include - - #include - #include -diff -ru pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc pekwm-0.1.5/src/PImageNativeLoaderXpm.cc ---- pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc 2009-03-03 22:59:01.000000000 +0000 -+++ pekwm-0.1.5/src/PImageNativeLoaderXpm.cc 2009-03-03 23:06:23.000000000 +0000 -@@ -13,10 +13,13 @@ - #include "PImageNativeLoaderXpm.hh" - - #include -+#include -+#include - - using std::cerr; - using std::endl; - using std::string; -+using std::sscanf; - - const uint PImageNativeLoaderXpm::CHANNELS = 4; - const uint PImageNativeLoaderXpm::ALPHA_SOLID = 255; diff --git a/pekwm-menu.patch b/pekwm-menu.patch new file mode 100644 index 0000000..2b53a42 --- /dev/null +++ b/pekwm-menu.patch @@ -0,0 +1,65 @@ +--- data/menu.in.orig 2010-04-20 10:57:29.327560081 -0300 ++++ data/menu.in 2010-04-20 14:09:47.653296490 -0300 +@@ -10,7 +10,6 @@ + Separator {} + + Submenu = "Editors" { +- Entry = "vi" { Actions = "Exec $TERM -title vi -e vi &" } + Entry = "vim" { Actions = "Exec $TERM -title vim -e vim &" } + Entry = "gvim" { Actions = "Exec gvim &" } + Entry = "Emacs" { Actions = "Exec emacs &" } +@@ -28,29 +27,23 @@ + Entry = "Amarok" { Actions = "Exec amarok &" } + Entry = "Quod Libet" { Actions = "Exec quodlibet &" } + Entry = "Xmms" { Actions = "Exec xmms &" } +- Entry = "MPlayer" { Actions = "Exec gmplayer &" } ++ Entry = "MPlayer" { Actions = "Exec gnome-mplayer &" } + Entry = "Xine" { Actions = "Exec xine &" } + Entry = "xawtv" { Actions = "Exec xawtv &" } +- Entry = "Ogle" { actions = "exec ogle &" } ++ Entry = "Totem" { actions = "exec totem &" } + Entry = "alsamixer" { Actions = "Exec $TERM -title alsamixer -e alsamixer &" } + } + Submenu = "Utils" { +- Entry = "XCalc" { Actions = "Exec xcalc &" } +- Entry = "XMan" { Actions = "Exec xman &" } ++ Entry = "Calculator" { Actions = "Exec gcalctool &" } + Entry = "Xpdf" { Actions = "Exec xpdf &" } +- Entry = "GGv" { Actions = "Exec ggv &" } + Entry = "Evince" { Actions = "Exec evince &" } + Entry = "gucharmap" { Actions = "Exec gucharmap &" } + Entry = "Gkrellm" { Actions = "Exec gkrellm &" } +- Entry = "Gkrellm2" { Actions = "Exec gkrellm2 &" } +- Entry = "ROX Filer" { Actions = "Exec rox &" } + } + Submenu = "WWW" { + Entry = "Dillo" { Actions = "Exec dillo &" } + Entry = "Konqueror" { Actions = "Exec konqueror &" } +- Entry = "Mozilla" { Actions = "Exec mozilla &" } + Entry = "Firefox" { Actions = "Exec firefox &" } +- Entry = "Mozilla Firefox" { Actions = "Exec mozilla-firefox &" } + } + Submenu = "FTP" { + Entry = "gftp" { Actions = "Exec gftp &" } +@@ -58,19 +51,17 @@ + } + Submenu = "Communication" { + Entry = "Mutt" { Actions = "Exec $TERM -title mutt -e mutt &" } +- Entry = "Pine" { Actions = "Exec $TERM -title pine -e pine &" } ++ Entry = "Alpine" { Actions = "Exec $TERM -title alpine -e alpine &" } + Entry = "Thunderbird" { Actions = "Exec thunderbird &" } +- Entry = "Mozilla Thunderbird" { Actions = "Exec mozilla-thunderbird &" } + Entry = "Evolution" { Actions = "Exec evolution &" } + Entry = "KMail" { Actions = "Exec kmail &" } +- Entry = "Gaim" { Actions = "Exec gaim &" } ++ Entry = "Pidgin" { Actions = "Exec pidgin &" } + Entry = "Irssi" { Actions = "Exec $TERM -title irssi -e irssi &" } + Entry = "Kopete" { Actions = "Exec kopete &" } + } + Submenu = "Office" { + Entry = "KOffice Workspace" { Actions = "Exec koshell &" } + Entry = "OpenOffice" { Actions = "Exec ooffice &" } +- Entry = "StarOffice" { Actions = "Exec soffice &" } + } + Submenu = "Development" { + Entry = "Anjuta" { Actions = "Exec anjuta &" } diff --git a/pekwm-xdg-menu.py b/pekwm-xdg-menu.py deleted file mode 100644 index e1cdf27..0000000 --- a/pekwm-xdg-menu.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# vim: noexpandtab:ts=4:sts=4 - -"""Menu Generator for PekWM -Generates a dynamic menu for PekWM using the freedesktop.org standards - -Usage: - - Options: - -l ..., --lang=... create the menu using a language. Default = $LANG - -h, --help show this help - -""" - -__author__ = "Michael Rice , Rudolf Kastl , Antonio Gomes" -__version__ = "$Revision: 1.0 $" -__date__ = "$Date: 2006/10/12 18:20:10 $" -__license__ = "GPL" - -import xdg.Menu,xdg.DesktopEntry -import getopt,os,sys - -def usage(): - print __doc__ - -def checkWm(entry): - if entry.DesktopEntry.getOnlyShowIn() != []: - entry.Show = False - if entry.DesktopEntry.getNotShowIn() != []: - if isinstance(entry, xdg.Menu.MenuEntry): - if wm in entry.DesktopEntry.getNotShowIn(): - entry.Show = False - else: - entry.Show = True - -def parseMenu(menu,depth=1): - print "%s Submenu = \"%s\" {" % ( (depth*"\t"), menu.getName().encode('utf8'), ) - depth += 1 - for entry in menu.getEntries(): - if isinstance(entry, xdg.Menu.Menu): - parseMenu(entry,depth) - elif isinstance(entry, xdg.Menu.MenuEntry): - checkWm(entry) - if entry.Show == False: continue - print "%sEntry = \"%s\" { Actions = \"Exec %s &\" } " % ( (depth*"\t"), \ - entry.DesktopEntry.getName().encode("utf8"), \ - entry.DesktopEntry.getExec().split()[0]) - elif isinstance(entry,xdg.Menu.Separator): - print "%sSeparator {}" % (depth*"\t") - elif isinstance(entry.xdg.Menu.Header): - print "%s%s" % ( (depth*"\t"), entry.Name ) - depth -= 1 - print "%s}" % (depth*"\t") -def main(argv): - lang = os.getenv("LANG","C") - try: - opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang="]) - except getopt.GetoptError: - usage() - raise SystemExit - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - raise SystemExit - elif opt in ("-l", "--lang"): - lang = arg - - menu=xdg.Menu.parse() - print "Dynamic {" - parseMenu(menu) - print "}" - -if __name__ == "__main__": - main(sys.argv[1:]) diff --git a/pekwm.desktop b/pekwm.desktop deleted file mode 100644 index 5972235..0000000 --- a/pekwm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=PekWM -Comment=Very small and fast window manger -Exec=pekwm -Terminal=False -TryExec=pekwm - -[Window Manager] -SessionManaged=true -# vi: encoding=utf-8 diff --git a/pekwm.spec b/pekwm.spec index dab5946..63bff31 100644 --- a/pekwm.spec +++ b/pekwm.spec @@ -1,128 +1,119 @@ -Name: pekwm -Version: 0.1.5 -Release: 10%{?dist} -Summary: The Pek Window Manager - -Group: User Interface/Desktops -# No version specified. -License: GPL+ -URL: http://pekwm.org -Source0: http://pekwm.org/files/%{name}-%{version}.tar.bz2 -Source1: %{name}.desktop -Source2: pekwm-xdg-menu.py -Patch0: pekwm_configure.patch -Patch2: pekwm_menu.patch -Patch3: pekwm-0.1.5-gcc43.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libX11-devel, xorg-x11-proto-devel, libXft-devel,libXpm-devel -BuildRequires: libXrandr-devel, libXinerama-devel, libpng-devel, libjpeg-devel -BuildRequires: pcre-devel -Requires: pyxdg, procps, xprop +Name: pekwm +Version: 0.1.12 +Release: 4%{?dist} +Summary: A small and flexible window manager + +Group: User Interface/Desktops +License: GPLv2+ +URL: http://www.pekwm.org/ +Source0: http://www.pekwm.org/projects/pekwm/files/%{name}-%{version}.tar.gz +Patch0: %{name}-menu.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libX11-devel libpng-devel libXrandr-devel +BuildRequires: libXft-devel libXext-devel libXinerama-devel +BuildRequires: libXpm-devel libjpeg-devel libICE-devel libSM-devel %description -A lightweight window manager with tabs based on aewm++. +Pekwm is a window manager that once up on a time was based on the aewm++ window +manager, but it has evolved enough that it no longer resembles aewm++ at all. +It has a much expanded feature-set, including window grouping (similar to ion, +pwm, or fluxbox), autoproperties, xinerama, keygrabber that supports keychains, +and much more. + + * Lightweight and Unobtrusive, a window manager shouldn't be noticed. + * Very configurable, we all work and think in different ways. + * Automatic properties, for all the lazy people, make things appear as they +should when starting applications. + * Chainable Keygrabber, usability for everyone. %prep %setup -q -%patch0 -%patch2 -%patch3 -p1 - -sed -i s,"",%{_bindir},g data/menu.in -sed -i s,"XftDrawString8","XftDrawStringUtf8", src/PFont.cc +# Exclude menu apps that are not in Fedora or are not free software +%patch0 -p0 -b .orig %build -%configure --enable-shape \ - --enable-xinerama \ - --enable-xrandr \ - --enable-xft \ - --enable-image-xpm \ - --enable-image-jpeg \ - --enable-image-png \ - --enable-menus \ - --enable-harbour \ - --enable-pcre \ - --x-includes=%{_includedir} \ - --x-libraries=%{_libdir} - +%configure make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT scriptsdir=%{_bindir} +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" + +# Create desktop file +mkdir -p %{buildroot}%{_datadir}/xsessions/ +cat << EOF > %{buildroot}%{_datadir}/xsessions/%{name}.desktop +[Desktop Entry] +Name=PekWM +Comment=Very small and fast window manger +Exec=pekwm +TryExec=pekwm +Type=XSession +EOF + +# Delete makefiles from contrib folder +find contrib/Makefile* -type f | xargs rm -rf || true +find contrib/lobo/Makefile* -type f | xargs rm -rf || true + +# Rearrange the contents of contrib folder +mv contrib/lobo/* contrib/ +rm -rf contrib/lobo + +# Fix permissions to include scripts in %%doc +find contrib/pekwm_autoprop.pl -type f | xargs chmod 0644 || true +find contrib/pekwm_menu_config.pl -type f | xargs chmod 0644 || true -mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/ -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/ -install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/pekwm-xdg-menu %clean -rm -rf $RPM_BUILD_ROOT - +rm -rf %{buildroot} %files -%defattr(-,root,root,755) -%doc AUTHORS ChangeLog -%{_bindir}/pekwm -%{_bindir}/pekwm-xdg-menu -%{_bindir}/pekwm_themeset.pl -%{_bindir}/pekwm_themeset.sh -%{_bindir}/pekwm_ws_menu.pl -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/themes/ -%dir %{_datadir}/%{name}/themes/default -%{_datadir}/%{name}/themes/default/theme -%dir %{_sysconfdir}/%{name} -%{_datadir}/xsessions/%{name}.desktop -%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start -%config(noreplace) %{_sysconfdir}/%{name}/menu -%config(noreplace) %{_sysconfdir}/%{name}/keys +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog ChangeLog.aewm++ ChangeLog.until-0.1.6 LICENSE NEWS README contrib/ +%{_bindir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/autoproperties %config(noreplace) %{_sysconfdir}/%{name}/config +%config(noreplace) %{_sysconfdir}/%{name}/keys +%config(noreplace) %{_sysconfdir}/%{name}/menu %config(noreplace) %{_sysconfdir}/%{name}/mouse %config(noreplace) %{_sysconfdir}/%{name}/vars - +%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start +%{_datadir}/%{name}/ +%{_mandir}/man1/%{name}.* +%{_datadir}/xsessions/%{name}.desktop %changelog -* Tue Mar 03 2009 Caolán McNamara - 0.1.5-10 -- include cstdio for std::scanf - -* Thu Feb 26 2009 Fedora Release Engineering - 0.1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Sep 17 2008 Matt Domsch - 0.1.5-8 -- fix FTBFS BZ#434089 - -* Thu Aug 28 2008 Tom "spot" Callaway - 0.1.5-7 -- fix license tag - -* Mon Feb 18 2008 Fedora Release Engineering - 0.1.5-6 -- Autorebuild for GCC 4.3 - -* Tue Oct 17 2006 Michael Rice - 0.1.5-5 -- Add UTF-8 support per: - http://adresh.com/pekwm/dev_docs/html/faq/answers.html#FAQ-1546 - -* Tue Oct 17 2006 Michael Rice - 0.1.5-4 -- Add dir datadir/name/themes/ for ownership -- Add BR for pcre -- Add Requires for use of pkill in a provided script -- Change summary & add a . to the description -- Change Requires to xprop and not xorg-x11-utils - -* Mon Oct 16 2006 Michael Rice - 0.1.5-3 -- Move default configs into sysconfdir -- Fix double listing of sysconf stuff -- Place all scripts into bindir -- fix typo in menu_patch - -* Fri Oct 13 2006 Michael Rice - 0.1.5-2 -- Add fedora compliant menu generator. -- Remake provided menu to use the pekwm-xdg-menu -- Add requires for pyxdg -- Rebuilt with pcre -- Add BR for jpeg, png, and xinerama - -* Mon Oct 09 2006 Michael Rice - 0.1.5-1 -- Initial RPM release +* Tue May 11 2010 German A. Racca 0.1.12-4 +- Fixed BuildRequires to compile from scratch + +* Sun May 09 2010 German A. Racca 0.1.12-3 +- Deleted makefiles form contrib folder +- Rearranged contents in contrib folder + +* Mon Apr 26 2010 German A. Racca 0.1.12-2 +- Added %%{dist} tag +- Fixed patch +- Added contrib stuff to docs + +* Tue Apr 20 2010 German A. Racca 0.1.12-1 +- New version 0.1.12 +- Fixed timestamp for tarball source +- Added BuildRoot tag +- Fixed BuildRequires +- Added menu patch +- Added INSTALL="install -p" to preserve timestamps +- Corrected type in xsession file +- Added ChangeLog.aewm++ and ChangeLog.until-0.1.6 to doc files +- Own directory %%{_datadir}/%%{name} +- Marqued 'start' as config file + +* Sat Feb 20 2010 German A. Racca 0.1.11-3 +- Changed Summary +- Changed BuildRequires +- Modified desktop file +- Added exec attr to 'start' file + +* Fri Jan 15 2010 German A. Racca 0.1.11-2 +- Added Source0 to spec file + +* Thu Dec 17 2009 German A. Racca 0.1.11-1 +- Initial release of RPM package diff --git a/pekwm_configure.patch b/pekwm_configure.patch deleted file mode 100644 index c6d77b9..0000000 --- a/pekwm_configure.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- configure 2006-04-17 13:22:36.000000000 -0500 -+++ configure.new 2006-10-09 14:19:21.000000000 -0500 -@@ -4915,18 +4915,18 @@ - if test x$xft_config_exec_prefix != x ; then - xft_config_args="$xft_config_args --exec-prefix=$xft_config_exec_prefix" - if test x${XFT_CONFIG+set} != xset ; then -- XFT_CONFIG=$xft_config_exec_prefix/bin/xft-config -+ XFT_CONFIG=$xft_config_exec_prefix/bin/pkg-config xft --cflags - fi - fi - if test x$xft_config_prefix != x ; then - xft_config_args="$xft_config_args --prefix=$xft_config_prefix" - if test x${XFT_CONFIG+set} != xset ; then -- XFT_CONFIG=$xft_config_prefix/bin/xft-config -+ XFT_CONFIG=$xft_config_prefix/bin/pkg-config xft --cflags - fi - fi - -- # Extract the first word of "xft-config", so it can be a program name with args. --set dummy xft-config; ac_word=$2 -+ # Extract the first word of "pkg-config xft --cflags", so it can be a program name with args. -+set dummy pkg-config xft --cflags; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_XFT_CONFIG+set}" = set; then -@@ -5013,10 +5013,10 @@ - echo ".$xft_wanted_micro_version." - echo "***" - echo "*** If you have already installed a sufficiently new version, this error" -- echo "*** probably means that the wrong copy of the xft-config shell script is" -+ echo "*** probably means that the wrong copy of the pkg-config xft --cflags shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of xft, but you can also set the XFT_CONFIG environment to point to the" -- echo "*** correct copy of xft-config. (In this case, you will have to" -+ echo "*** correct copy of pkg-config xft --cflags. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi -@@ -5031,8 +5031,8 @@ - #define HAVE_XFT - _ACEOF - -- XFT_LIBS=`xft-config --libs` -- XFT_CFLAGS=`xft-config --cflags` -+ XFT_LIBS=`pkg-config xft --cflags --libs` -+ XFT_CFLAGS=`pkg-config xft --cflags --cflags` - LIBS="$LIBS $XFT_LIBS" - CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" - FEATURES="$FEATURES Xft"; -@@ -5041,10 +5041,10 @@ - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - if test "$XFT_CONFIG" = "no" ; then -- echo "*** The xft-config script installed by xft could not be found" -+ echo "*** The pkg-config xft --cflags script installed by xft could not be found" - echo "*** If xft was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XFT_CONFIG environment variable to the" -- echo "*** full path to xft-config." -+ echo "*** full path to pkg-config xft --cflags." - fi - XFT_CFLAGS="" - XFT_LIBS="" diff --git a/pekwm_menu.patch b/pekwm_menu.patch deleted file mode 100644 index aa499f1..0000000 --- a/pekwm_menu.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- data/menu.in 2006-04-17 13:22:21.000000000 -0500 -+++ data/my_menu.in 2006-10-16 16:01:25.000000000 -0500 -@@ -6,97 +6,33 @@ - RootMenu = "Pekwm" { - Entry = "Terminal" { Actions = "Exec $TERM &" } - Entry = "Run.." { Actions = "ShowCmdDialog" } -+ Entry = "Web Browser" { Actions = "Exec htmlview &" } - - Separator {} -- -- Submenu = "Editors" { -- Entry = "vi" { Actions = "Exec $TERM -title vi -e vi &" } -- Entry = "vim" { Actions = "Exec $TERM -title vim -e vim &" } -- Entry = "gvim" { Actions = "Exec gvim &" } -- Entry = "Emacs" { Actions = "Exec emacs &" } -- Entry = "Emacs Terminal" { Actions = "Exec $TERM -title emacs -e emacs -nw &" } -- Entry = "Kate" { Actions = "Exec kate &" } -- } -- Submenu = "Graphics" { -- Entry = "display" { Actions = "Exec display &" } -- Entry = "Gimp" { Actions = "Exec gimp &" } -- Entry = "Gv" { Actions = "Exec gv &" } -- Entry = "Xpdf" { Actions = "Exec xpdf &" } -- Entry = "gqview" { Actions = "Exec gqview &" } -- } -- Submenu = "Multimedia" { -- Entry = "Amarok" { Actions = "Exec amarok &" } -- Entry = "Quod Libet" { Actions = "Exec quodlibet &" } -- Entry = "Xmms" { Actions = "Exec xmms &" } -- Entry = "MPlayer" { Actions = "Exec gmplayer &" } -- Entry = "Xine" { Actions = "Exec xine &" } -- Entry = "xawtv" { Actions = "Exec xawtv &" } -- Entry = "Ogle" { actions = "exec ogle &" } -- Entry = "alsamixer" { Actions = "Exec $TERM -title alsamixer -e alsamixer &" } -- } -- Submenu = "Utils" { -- Entry = "XCalc" { Actions = "Exec xcalc &" } -- Entry = "XMan" { Actions = "Exec xman &" } -- Entry = "Xpdf" { Actions = "Exec xpdf &" } -- Entry = "GGv" { Actions = "Exec ggv &" } -- Entry = "Evince" { Actions = "Exec evince &" } -- Entry = "gucharmap" { Actions = "Exec gucharmap &" } -- Entry = "Gkrellm" { Actions = "Exec gkrellm &" } -- Entry = "Gkrellm2" { Actions = "Exec gkrellm2 &" } -- Entry = "ROX Filer" { Actions = "Exec rox &" } -- } -- Submenu = "WWW" { -- Entry = "Dillo" { Actions = "Exec dillo &" } -- Entry = "Konqueror" { Actions = "Exec konqueror &" } -- Entry = "Mozilla" { Actions = "Exec mozilla &" } -- Entry = "Firefox" { Actions = "Exec firefox &" } -- Entry = "Mozilla Firefox" { Actions = "Exec mozilla-firefox &" } -- } -- Submenu = "FTP" { -- Entry = "gftp" { Actions = "Exec gftp &" } -- Entry = "lftp" { Actions = "Exec $TERM -title lftp -e lftp &" } -- } -- Submenu = "Communication" { -- Entry = "Mutt" { Actions = "Exec $TERM -title mutt -e mutt &" } -- Entry = "Pine" { Actions = "Exec $TERM -title pine -e pine &" } -- Entry = "Thunderbird" { Actions = "Exec thunderbird &" } -- Entry = "Mozilla Thunderbird" { Actions = "Exec mozilla-thunderbird &" } -- Entry = "Evolution" { Actions = "Exec evolution &" } -- Entry = "KMail" { Actions = "Exec kmail &" } -- Entry = "Gaim" { Actions = "Exec gaim &" } -- Entry = "Irssi" { Actions = "Exec $TERM -title irssi -e irssi &" } -- Entry = "Kopete" { Actions = "Exec kopete &" } -- } -- Submenu = "Office" { -- Entry = "KOffice Workspace" { Actions = "Exec koshell &" } -- Entry = "OpenOffice" { Actions = "Exec ooffice &" } -- Entry = "StarOffice" { Actions = "Exec soffice &" } -- } -- Submenu = "Development" { -- Entry = "Anjuta" { Actions = "Exec anjuta &" } -- Entry = "Eclipse" { Actions = "Exec eclipse &" } -- Entry = "KDevelop" { Actions = "Exec kdevelop &" } -- } -- -+ -+ Submenu = "Fedora Menu" { -+ Entry { Actions = "Dynamic /pekwm-xdg-menu" } -+ } -+ - Separator {} - - Submenu = "Go to" { - SubMenu = "Workspace" { - # Create goto menu once per pekwm config reload. The fast way that - # will work for most if not all users. -- COMMAND = "/scripts/pekwm_ws_menu.pl -n goto" -+ COMMAND = "/pekwm_ws_menu.pl -n goto" - # Create goto menu every time the menu is opened. The slow way. - # This is what you want if you are using external tools to make - # the amount of workspaces something else than what you define in - # ~/.pekwm/config. You will know if you want this. -- # Entry = "" { Actions = "Dynamic /scripts/pekwm_ws_menu.pl goto" } -+ # Entry = "" { Actions = "Dynamic /pekwm_ws_menu.pl goto" } - } - Entry = "Window.." { Actions = "ShowMenu GotoClient True" } - } - Submenu = "Pekwm" { - Submenu = "Themes" { -- Entry { Actions = "Dynamic /scripts/pekwm_themeset.pl /themes" } -- Entry { Actions = "Dynamic /scripts/pekwm_themeset.pl ~/.pekwm/themes" } -+ Entry { Actions = "Dynamic /pekwm_themeset.pl /themes" } -+ Entry { Actions = "Dynamic /pekwm_themeset.pl ~/.pekwm/themes" } - } - Entry = "Reload" { Actions = "Reload" } - Entry = "Restart" { Actions = "Restart" } -@@ -143,12 +79,12 @@ - SubMenu = "Send To" { - # Create sendto menu once per pekwm config reload. The fast way that - # will work for most if not all users. -- COMMAND = "/scripts/pekwm_ws_menu.pl -n send" -+ COMMAND = "/pekwm_ws_menu.pl -n send" - # Create sendto menu every time the menu is opened. The slow way. - # This is what you want if you are using external tools to make - # the amount of workspaces something else than what you define in - # ~/.pekwm/config. You will know if you want this. -- # Entry = "" { Actions = "Dynamic /scripts/pekwm_ws_menu.pl send" } -+ # Entry = "" { Actions = "Dynamic /pekwm_ws_menu.pl send" } - } - Separator {} - Entry = "Close" { Actions = "Close" } diff --git a/sources b/sources index bd6538f..0e2e04c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe3e0d77250d27963991994f83ccb4ea pekwm-0.1.5.tar.bz2 +1f7f9ed32cc03f565a3ad30fd6045c1f pekwm-0.1.12.tar.gz