[rubygem-raindrops: 5/5] Merge branch 'f17'

[Guillermo Gómez]

commit 9a6931d8761f383fd2f2dd4f91b107fc12da4a93
Merge: 2cb84ed 7e71c8c
Author: Guillermo Gomez S. (Gomix) <guillermo.gomez at gmail.com>
Date:   Sun Feb 12 14:47:29 2012 -0430

    Merge branch 'f17'

 rubygem-raindrops.spec |   63 +++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 25 deletions(-)
---
diff --cc rubygem-raindrops.spec
index 4be8324,839e805..7785a9a
--- a/rubygem-raindrops.spec
+++ b/rubygem-raindrops.spec
@@@ -66,9 -70,8 +70,14 @@@ require "rubygems"' .%{gem_instdir}/tes
  
  %install
  mkdir -p %{buildroot}%{gem_dir}
++<<<<<<< HEAD
 +cp -a .%{gem_dir}/* \
 +        %{buildroot}%{gem_dir}/
 +
++=======
+ mkdir -p %{buildroot}%{gem_extdir}/lib
+ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
++>>>>>>> f17
  
  # Remove the binary extension sources and build leftovers.
  rm -rf %{buildroot}%{gem_instdir}/ext