[fawkes] Update to 0.4.1

[Tim Niemueller]

commit 6ea9f1f2921c360ea03bb950bc98494980285325
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Sun Jan 9 19:57:41 2011 +0100

    Update to 0.4.1
    
    - Update to 0.4.1 (includes all patches of 0.4 package)
    - Added more requires to devenv package

 .gitignore                     |    4 +-
 fawkes-0.4-desktop-files.patch |  213 ----
 fawkes-0.4-docs.patch          | 1308 ----------------------
 fawkes-0.4-libmicrohttpd.patch |   71 --
 fawkes-0.4-man-pages.patch     | 2357 ----------------------------------------
 fawkes-0.4-userconf.patch      |  823 --------------
 fawkes.spec                    |   37 +-
 sources                        |    2 +-
 8 files changed, 28 insertions(+), 4787 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49bce20..7f0166f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/fawkes-0.4.tar.bz2
-/fawkes-0.4
+/fawkes-0.4.1
 .build*
 /*.src.rpm
 /noarch
 /x86_64
+/fawkes-0.4.1.tar.bz2
diff --git a/fawkes.spec b/fawkes.spec
index 0b2f08b..783d813 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -1,17 +1,12 @@
 Name:           fawkes
-Version:        0.4
-Release:        6%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Robot Software Framework
 
 Group:          Applications/System
 License:        GPLv2+ and GPLv2+ with exceptions
 URL:            http://www.fawkesrobotics.org
 Source0:        http://files.fawkesrobotics.org/releases/%{name}-%{version}.tar.bz2
-Patch0:         fawkes-0.4-userconf.patch
-Patch1:         fawkes-0.4-man-pages.patch
-Patch2:         fawkes-0.4-docs.patch
-Patch3:         fawkes-0.4-desktop-files.patch
-Patch4:         fawkes-0.4-libmicrohttpd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
@@ -86,12 +81,14 @@ Group:          Development/Libraries
 BuildArch:      noarch
 %endif
 Requires:       gcc-c++
+Requires:       git
 Requires:       kernel-headers >= 2.6.17, sqlite-devel, openssl-devel >= 0.9.8
 Requires:       libxml++-devel >= 2.20, libdaemon-devel >= 0.10, avahi-devel
 Requires:       lua-devel >= 5.1, tolua++-devel
 Requires:       libdc1394-devel >= 2.0, libjpeg-devel >= 6b, libpng-devel >= 1.2, opencv-devel, SDL-devel
 Requires:       libkni3-devel >= 3.9
 Requires:       libmicrohttpd-devel >= 0.4
+Requires:       flite-devel
 Requires:       glibmm24-devel, gtkmm24-devel, cairomm, gconfmm26-devel, libglademm24-devel >= 2.6
 Requires:       doxygen, asciidoc, graphviz, docbook-style-xsl, libxslt
 Requires:       urg-devel >= 0.8
@@ -101,9 +98,11 @@ Requires:       readline-devel >= 5.1
 Requires:       file-devel
 Requires:       graphviz-devel >= 2.22
 Requires:       gearbox-devel >= 9.11
+Requires:       texlive-latex, texlive-dvips
 %else
 # el5
 Requires:       file
+Requires:       tetex-latex, tetex-dvips
 %endif
 # not on el*
 %if ! 0%{?rhel}
@@ -302,11 +301,6 @@ common Lua modules.
 
 %prep
 %setup -q
-%patch0 -p1 -b .userconf
-%patch1 -p1 -b .man-pages
-%patch2 -p1 -b .docs
-%patch3 -p1 -b .desktop-files
-%patch4 -p1 -b .libmicrohttpd
 
 
 %build
@@ -442,6 +436,16 @@ rm -rf %{buildroot}
 %{_libdir}/libfawkesgeometrygtk.so.*
 %{_datadir}/%{name}/guis
 %{_datadir}/applications/*
+%{_mandir}/man1/ffbatterymon.1*
+%{_mandir}/man1/ffconfiggui.1*
+%{_mandir}/man1/ffplugingui.1*
+%{_mandir}/man1/ffnetloggui.1*
+%{_mandir}/man1/ffwiviewer.1*
+%{_mandir}/man1/lasergui.1*
+%{_mandir}/man1/skillgui.1*
+%{_mandir}/man1/skillgui_batch_render.1*
+%{_mandir}/man1/firestation.1*
+%{_mandir}/man1/fvfuseviewer.1*
 
 %files lua -f builtin-interfaces-lua.files
 %defattr(-,root,root,-)
@@ -476,6 +480,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/interfaces/libSkillerDebugInterface.so*
 %dir %{_libdir}/%{name}/lua/interfaces
 %{_libdir}/%{name}/lua/interfaces/SkillerDebugInterface.so
+%{_mandir}/man1/skillet.1*
 
 %files plugin-luaagent
 %defattr(-,root,root,-)
@@ -499,6 +504,7 @@ rm -rf %{buildroot}
 %{_bindir}/ffbblog
 %{_libdir}/%{name}/plugins/bblogger.so
 %{_libdir}/%{name}/plugins/bblogreplay.so
+%{_mandir}/man1/ffbblog.1*
 
 %files plugin-flite
 %defattr(-,root,root,-)
@@ -508,11 +514,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/ffjoystick
 %{_libdir}/%{name}/plugins/joystick.so
+%{_mandir}/man1/ffjoystick.1*
 
 %files plugin-laser
 %defattr(-,root,root,-)
 %{_bindir}/fflaser_deadspots
 %{_libdir}/%{name}/plugins/laser.so
+%{_mandir}/man1/fflaser_deadspots.1*
 
 %files plugin-laserht
 %defattr(-,root,root,-)
@@ -533,6 +541,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/refboxcomm.so
 %{_bindir}/ffrefboxrep
+%{_mandir}/man1/ffrefboxrep.1*
 
 %if ! 0%{?rhel}
 %files plugin-xmlrpc
@@ -557,6 +566,10 @@ rm -rf %{buildroot}
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Sun Jan 09 2011 Tim Niemueller <tim at niemueller.de> - 0.4.1-1
+- Update to 0.4.1 (includes all patches of 0.4 package)
+- Added more requires to devenv package
+
 * Mon Nov 08 2010 Tim Niemueller <tim at niemueller.de> - 0.4-6
 - Add patch and rebuild for new libmicrohttpd
 
diff --git a/sources b/sources
index e8ff40e..9575076 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b739a8d53d4a6a4cd145ba3c5fdacd87  fawkes-0.4.tar.bz2
+acfc00fa76f51002212c71596a5e8287  fawkes-0.4.1.tar.bz2