diff --git a/.cvsignore b/.cvsignore index 24a0ce9..459b43d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fluxbox-0.9.15.1.tar.bz2 +fluxbox-1.0rc3.tar.bz2 diff --git a/fluxbox-xdg-menu.py b/fluxbox-xdg-menu.py index a2d1625..bbf0cb3 100644 --- a/fluxbox-xdg-menu.py +++ b/fluxbox-xdg-menu.py @@ -30,7 +30,7 @@ To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --b __author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice" __version__ = "$Revision: 1.2 $" -__date__ = "$Date: 2006/10/09 23:20:10 $" +__date__ = "$Date: 2006/10/21 09:38:14 $" __license__ = "GPL" @@ -115,11 +115,13 @@ def parseMenu(menu,wm,use_icons,theme,depth=1): parseMenu(entry,wm,use_icons,theme,depth) elif isinstance(entry, xdg.Menu.MenuEntry): checkWm(entry,wm) - if entry.Show == False: continue + if entry.Show == False: continue + appname = entry.DesktopEntry.getName().encode("utf8"); + appname = appname.replace(")","\)"); if use_icons: - print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) ) + print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), appname, entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) ) else: - print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] ) + print "%s[exec] (%s) {%s} " % ( (depth*"\t"), appname, entry.DesktopEntry.getExec().split()[0] ) elif isinstance(entry,xdg.Menu.Separator): print "%s[separator]" % (depth*"\t") elif isinstance(entry.xdg.Menu.Header): diff --git a/fluxbox.spec b/fluxbox.spec index 18c9db6..e9155e8 100644 --- a/fluxbox.spec +++ b/fluxbox.spec @@ -1,6 +1,6 @@ Name: fluxbox -Version: 0.9.15.1 -Release: 3%{?dist} +Version: 1.0.0 +Release: 0.1.rc3%{?dist} Summary: Window Manager based on Blackbox @@ -8,7 +8,7 @@ Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2 +Source0: http://download.sourceforge.net/fluxbox/fluxbox-1.0rc3.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py @@ -25,7 +25,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel BuildRequires: fontconfig-devel - +BuildRequires: libtool Requires: pyxdg Requires: artwiz-aleczapka-fonts @@ -40,7 +40,7 @@ Have a look at the homepage for more info ;) %prep -%setup -q +%setup -q -n %{name}-1.0rc3 %build %configure --enable-xft \ @@ -50,9 +50,10 @@ Have a look at the homepage for more info ;) --enable-imlib2 \ --enable-nls \ --x-includes=%{_includedir} \ - --x-libraries=%{_libdir} + --x-libraries=%{_libdir} \ + --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT @@ -76,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xsessions/fluxbox.desktop %changelog +* Tue Mar 20 2007 Andreas Bierfert +1.0.0-0.1.rc3 +- version upgrade +- fix #236509 +- fix #229307 + * Sat Oct 21 2006 Andreas Bierfert 0.9.15.1-3 - fix #209347,#196106, and #187740 diff --git a/sources b/sources index 8f24249..653f75e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -098eb36a09338aabb63b938a5eab9ef6 fluxbox-0.9.15.1.tar.bz2 +8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2