[fawkes: 11/12] Merge branch 'master' into f16

[Tim Niemueller]

commit b42c1bdbec2af8269ceee2b734c3d076acf45616
Merge: 5c9fca2 0634ab1
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Fri Sep 28 10:59:23 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	fawkes.spec

 .gitignore                   |    2 +-
 fawkes-0.4.2-build-fix.patch |   12 -
 fawkes-0.4.2-ppc64.patch     |   14 -
 fawkes.spec                  |  564 ++++++++++++++++++++++++++++++------------
 sources                      |    2 +-
 5 files changed, 411 insertions(+), 183 deletions(-)
---
diff --cc fawkes.spec
index d960b6e,63039c2..fc53f13
--- a/fawkes.spec
+++ b/fawkes.spec
@@@ -531,9 -669,19 +669,17 @@@ rm -rf %{buildroot
  %files plugin-laser
  %defattr(-,root,root,-)
  %{_bindir}/fflaser_deadspots
 -%ifnarch ppc ppc64
  %{_libdir}/%{name}/plugins/laser.so
 -%endif
  %{_mandir}/man1/fflaser_deadspots.1*
  
+ %files plugin-laser-filter
+ %defattr(-,root,root,-)
+ %{_libdir}/%{name}/plugins/laser-filter.so
+ 
+ %files plugin-laser-pointclouds
+ %defattr(-,root,root,-)
+ %{_libdir}/%{name}/plugins/laser-pointclouds.so
+ 
  %files plugin-laserht
  %defattr(-,root,root,-)
  %{_libdir}/%{name}/plugins/laserht.so