[kdebindings: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdebindings

[Rex Dieter]

commit f0000332155bae40a667b09c7586d2413ca162e6
Merge: 9119c6a df63bcb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 8 17:56:52 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdebindings
    
    Conflicts:
    	kdebindings.spec

 .gitignore       |    1 +
 kdebindings.spec |   36 ++++++++++++++++++------------------
 sources          |    2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --cc kdebindings.spec
index e26ed57,8d3e364..d8a5af9
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@@ -311,10 -314,7 +318,9 @@@ pushd %{_target_platform
    ..
  popd
  
- # smp build not recommended (upstream)
 -make %{?_smp_mflags} -C %{_target_platform}
 +make %{?_smp_mflags} -C %{_target_platform} || \
 +  gdb -batch -x %{SOURCE10} ; \
 +  valgrind ./generator/bin/smokegen -config ./smoke/kde/akonadi/config.xml -smokeconfig ../smoke/kde/akonadi/smokeconfig.xml -I /usr/include -- ../smoke/kde/akonadi/akonadi_includes.h
  
  
  %install