[fawkes: 9/12] Merge branch 'master' into f18

[Tim Niemueller]

commit bdb71c0b6ed66528c1dcc3f6081403aad855f3a4
Merge: 0caa7c9 56037cd
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Fri Sep 28 10:54:27 2012 +0200

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

 .gitignore                   |    2 +-
 fawkes-0.4.2-build-fix.patch |   12 -
 fawkes-0.4.2-gcc47.patch     |  151 ------------
 fawkes-0.4.2-ppc64.patch     |   14 -
 fawkes.spec                  |  538 ++++++++++++++++++++++++++++++------------
 sources                      |    2 +-
 6 files changed, 388 insertions(+), 331 deletions(-)
---
diff --cc fawkes.spec
index 961a100,fa89c0e..63039c2
--- a/fawkes.spec
+++ b/fawkes.spec
@@@ -36,9 -38,11 +38,10 @@@ BuildRequires:  fil
  BuildRequires:  tetex-latex, tetex-dvips
  %endif
  %if ! 0%{?rhel}
+ BuildRequires:  clipsmm-devel >= 0.2.1
  BuildRequires:  xmlrpc-c-devel
  BuildRequires:  player-devel >= 3.0
 -#BuildRequires:  hokuyoaist-devel
 -BuildRequires:  gearbox-devel
 +BuildRequires:  hokuyoaist-devel
  %endif
  # s390(x) doesn't FireWire and other necessary parts
  ExcludeArch:    s390 s390x