diff --git a/.cvsignore b/.cvsignore index b9f31c3..1a99965 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ +fluxbox-0.9.13.tar.bz2 artwiz-aleczapka.tar.bz2 -fluxbox-0.9.9.tar.bz2 diff --git a/fluxbox-0.9.9-gcc34.patch b/fluxbox-0.9.9-gcc34.patch deleted file mode 100644 index 64e47eb..0000000 --- a/fluxbox-0.9.9-gcc34.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur fluxbox-0.9.9-orig/src/FbTk/Resource.hh fluxbox-0.9.9/src/FbTk/Resource.hh ---- fluxbox-0.9.9-orig/src/FbTk/Resource.hh 2003-12-19 19:25:39.000000000 +0100 -+++ fluxbox-0.9.9/src/FbTk/Resource.hh 2004-11-13 01:01:01.000000000 +0100 -@@ -33,9 +33,11 @@ - #include - #include - -+#include "XrmDatabaseHelper.hh" -+ - namespace FbTk { - --class XrmDatabaseHelper; -+//class XrmDatabaseHelper; - - /// Base class for resources, this is only used in ResourceManager - class Resource_base:private FbTk::NotCopyable -diff -Nur fluxbox-0.9.9-orig/src/FbTk/Menu.cc fluxbox-0.9.9/src/FbTk/Menu.cc ---- fluxbox-0.9.9-orig/src/FbTk/Menu.cc 2004-04-20 00:47:36.000000000 +0200 -+++ fluxbox-0.9.9/src/FbTk/Menu.cc 2004-11-13 01:00:36.000000000 +0100 -@@ -489,9 +489,8 @@ - if (m_need_update && (m_frame_pm.width() != menu.frame.width() || - m_frame_pm.height() != menu.frame.height() )){ - -- m_frame_pm = FbTk::FbPixmap(menu.frame.window(), -- menu.frame.width(), menu.frame.height(), -- menu.frame.depth()); -+ FbTk::FbPixmap tmp(menu.frame.window(), menu.frame.width(), menu.frame.height(), menu.frame.depth()); -+ m_frame_pm = tmp; - - if (m_frame_pm.drawable() == 0) { - cerr<<"FbTk::Menu: Warning: Failed to create pixmap ("<< diff --git a/fluxbox-0.9.9-gcc4.patch b/fluxbox-0.9.9-gcc4.patch deleted file mode 100644 index 908ed09..0000000 --- a/fluxbox-0.9.9-gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur fluxbox-0.9.9-orig/src/Toolbar.cc fluxbox-0.9.9/src/Toolbar.cc ---- fluxbox-0.9.9-orig/src/Toolbar.cc 2004-01-21 14:36:09.000000000 +0100 -+++ fluxbox-0.9.9/src/Toolbar.cc 2005-04-13 19:47:43.000000000 +0200 -@@ -101,7 +101,7 @@ - setDefaultValue(); - } - --string FbTk::Resource:: -+template <> string FbTk::Resource:: - getString() { - switch (m_value) { - case Toolbar::TOPLEFT: diff --git a/fluxbox-0.9.9.startfluxbox-UTF-8.patch b/fluxbox-0.9.9.startfluxbox-UTF-8.patch deleted file mode 100644 index cab7373..0000000 --- a/fluxbox-0.9.9.startfluxbox-UTF-8.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- fluxbox-0.9.8.orig/util/startfluxbox.in 2003-12-06 17:29:21.000000000 +0100 -+++ fluxbox-0.9.8/util/startfluxbox.in 2004-01-26 22:45:47.000000000 +0100 -@@ -1,14 +1,8 @@ - #!/bin/sh - # $Id: startfluxbox.in,v 1.3 2003/12/06 16:29:21 fluxgen Exp $ --if [ -x ~/.fluxbox/startup ]; then -- exec ~/.fluxbox/startup --elif [ -r ~/.fluxbox/startup ]; then -- exec sh ~/.fluxbox/startup --else -- if [ ! -d ~/.fluxbox ]; then -- mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} -- fi -- if [ ! -r ~/.fluxbox/startup ]; then -+ -+create_startup_script() { -+ - cat << EOF > ~/.fluxbox/startup - # fluxbox startup-script: - # -@@ -56,11 +50,56 @@ else - # And last but not least we start fluxbox. - # Because it is the last app you have to run it with ''exec'' before it. - -+tmp=\`echo \$LANG | grep UTF\` -+if [ -n \$tmp ]; then -+ #ugly workaround for fluxbox UTF-8 slow loading bug -+ export LC_CTYPE=C -+fi -+ - exec @pkgbindir@/fluxbox - # or if you want to keep a log: - # exec @pkgbindir@/fluxbox -log ~/.fluxbox/log - EOF -- fi - chmod 755 ~/.fluxbox/startup - exec ~/.fluxbox/startup -+} -+ -+ -+utf_need_fix=`echo $LANG | grep UTF-8` -+ -+ -+if [ -x ~/.fluxbox/startup ]; then -+ utf_is_fixed=`grep "LC_CTYPE=C" ~/.fluxbox/startup` -+ # startup script is +x -+ if [ -z "$utf_need_fix" ]; then -+ echo "-- System doesn't need UTF-8 workaround" -+ # system is not UTF-8 -+ exec ~/.fluxbox/startup -+ elif [ -z "$utf_is_fixed" ]; then -+ echo "-- System needs UTF-8 workaround for the first time" -+ create_startup_script -+ else echo "-- System needs UTF-8 workaround which is already applied" -+ exec ~/.fluxbox/startup -+ fi -+ -+elif [ -r ~/.fluxbox/startup ]; then -+ utf_is_fixed=`grep "LC_CTYPE=C" ~/.fluxbox/startup` -+ # start script isn't +x but +r -+ if [ -z "$utf_need_fix" ]; then -+ echo "-- System doesn't need UTF-8 workaround" -+ # system is not UTF-8 -+ exec sh ~/.fluxbox/startup -+ elif [ -z "$utf_is_fixed" ]; then -+ echo "-- System needs UTF-8 workaround for the first time" -+ create_startup_script -+ else echo "-- System needs UTF-8 workaround which is already applied" -+ exec sh ~/.fluxbox/startup -+ fi -+else -+ if [ ! -d ~/.fluxbox ]; then -+ # .fluxbox doesn't exist -+ mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} -+ fi -+ create_startup_script; - fi -+ diff --git a/fluxbox.spec b/fluxbox.spec index e9df7dd..e7bcca5 100644 --- a/fluxbox.spec +++ b/fluxbox.spec @@ -1,25 +1,21 @@ -Name: fluxbox -Version: 0.9.9 -Release: 4 +Name: fluxbox +Version: 0.9.13 +Release: 2%{?dist} Summary: Window Manager based on Blackbox -Group: User Interface/Desktops -License: MIT -URL: http://fluxbox.sourceforge.net +Group: User Interface/Desktops +License: MIT +URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.9.tar.bz2 -Source1: Xclients.%{name} -Source2: FluxBox -Source3: fluxbox.desktop -Source4: artwiz-aleczapka.tar.bz2 - -Patch0: fluxbox-0.9.9.startfluxbox-UTF-8.patch -Patch1: fluxbox-0.9.9-gcc34.patch -Patch2: fluxbox-0.9.9-gcc4.patch +Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.13.tar.bz2 +Source1: Xclients.%{name} +Source2: FluxBox +Source3: fluxbox.desktop +Source4: artwiz-aleczapka.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -BuildRequires: XFree86-devel +BuildRequires: xorg-x11-devel Buildrequires: zlib-devel Requires(post): chkfontpath Requires(postun): chkfontpath @@ -37,10 +33,6 @@ Have a look at the homepage for more info ;) %prep %setup -q -%patch0 -p1 -b .UTF-8 -%patch1 -p1 -b .gcc34 -%patch2 -p1 -b .gcc4 - %build @@ -78,10 +70,10 @@ tar xjf %SOURCE4 -C $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/ %post # New menu-system %{_prefix}/X11R6/bin/fluxbox-generate_menu \ - -kg \ + -kg -in -ds\ -p %{_datadir} \ -o %{_datadir}/fluxbox/menu \ - -m Fluxbox-0.9.9 2>&1 > /dev/null + -m Fluxbox-0.9.13 2>&1 > /dev/null #artwiz fontz @@ -118,6 +110,13 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka %changelog +* Wed Jun 08 2005 Andreas Bierfert +0.9.13-2.fc5 +- fix generate menu bug and revisit switches + +* Tue May 31 2005 Andreas Bierfert +- upgrade to 0.9.13 + * Wed Apr 13 2005 Michael Schwendt - 0.9.9-4 - Fix build for GCC 4. diff --git a/sources b/sources index 24eddc5..8378ec5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +f9b7b3c3b8e1e9ce3449601b238d4fba fluxbox-0.9.13.tar.bz2 3c7da9a10a84d517e6846b2031950380 artwiz-aleczapka.tar.bz2 -b96f9b23b6605274bf0f7c3f84d080f1 fluxbox-0.9.9.tar.bz2