[rubygem-kgio: 10/11] Merge branch 'f17'

[Guillermo Gómez]

commit d3e7a8ce142c130201bad2c719d3b99ec713454b
Merge: 3ec2acf 312cbba
Author: Guillermo Gomez S. (Gomix) <guillermo.gomez at gmail.com>
Date:   Sun Feb 12 10:52:41 2012 -0430

    Merge branch 'f17'
    
    Conflicts:
    	rubygem-kgio.spec

 rubygem-kgio.spec |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 56 insertions(+), 1 deletions(-)
---
diff --cc rubygem-kgio.spec
index cfc3f46,134c158..33d4de1
--- a/rubygem-kgio.spec
+++ b/rubygem-kgio.spec
@@@ -19,8 -20,10 +20,13 @@@ Requires:      ruby(abi) = %{rubyabi
  Requires:      ruby(rubygems) 
  BuildRequires: ruby 
  BuildRequires: ruby(abi) = %{rubyabi}
 -BuildRequires: ruby(rubygems) 
 +BuildRequires: rubygems-devel
  BuildRequires: ruby-devel
++<<<<<<< HEAD
++=======
+ BuildRequires: ruby-irb
+ BuildRequires: rubygems-devel
++>>>>>>> f17
  BuildRequires: rubygem(minitest)
  Provides:      rubygem(%{gem_name}) = %{version}
  ExcludeArch:   ppc ppc64
@@@ -41,21 -44,26 +47,42 @@@ Documentation for %{name
  
  %prep
  %setup -q -c -T
++<<<<<<< HEAD
 +
 +%build
 +mkdir -p .%{gem_dir}
 +export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 +gem install --local --install-dir .%{gem_dir} \
 +            -V \
 +            --force %{SOURCE0}
++=======
+ mkdir -p .%{gem_dir}
+ export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+ gem install \
+ 	-V \
+ 	--local \
+         --install-dir .%{gem_dir} \
+ 	--force \
+ 	--rdoc \
+ 	%{SOURCE0}
++>>>>>>> f17
  
  # Adjusting minor permissions
  chmod a+r .%{gem_instdir}/ChangeLog
  chmod a+r .%{gem_instdir}/NEWS
++<<<<<<< HEAD
++=======
+ 
+ %build
++>>>>>>> f17
  
  %install
  rm -rf %{buildroot}
  mkdir -p %{buildroot}%{gem_dir}
++<<<<<<< HEAD
++=======
+ mkdir -p %{buildroot}%{gem_extdir}/lib
++>>>>>>> f17
  cp -a .%{gem_dir}/* \
          %{buildroot}%{gem_dir}/
  patch %{buildroot}%{gem_instdir}/test/test_autopush.rb %{SOURCE1}
@@@ -74,19 -82,19 +101,32 @@@ rm -f %{buildroot}/%{gem_instdir}/GIT-V
  rm -rf %{buildroot}%{gem_instdir}/.yardoc
  rm -rf %{buildroot}%{gem_instdir}/ext
  
++<<<<<<< HEAD
 +install -d -m0755 %{buildroot}%{ruby_vendorarchdir}
 +mv %{buildroot}%{gem_libdir}/kgio_ext.so %{buildroot}%{ruby_vendorarchdir}
++=======
+ install -d -m0755 %{buildroot}%{gem_extdir}
+ mv %{buildroot}%{gem_instdir}/lib/kgio_ext.so %{buildroot}%{gem_extdir}/lib/
++>>>>>>> f17
  
  %check
  # Patch test_autopush.rb
  cd %{buildroot}%{gem_instdir}
++<<<<<<< HEAD
 +RUBYOPT="-Ilib -I%{buildroot}%{ruby_vendorarchdir} -Itest" testrb test/test_*
++=======
+ RUBYOPT="-Ilib -I%{buildroot}%{ruby_sitearch} -Itest" testrb test/test_*
++>>>>>>> f17
  
  %clean
  rm -rf %{buildroot}
  
  %files doc
++<<<<<<< HEAD
 +%doc %{gem_docdir}
++=======
+ %doc %{gem_dir}/doc/%{gem_name}-%{version}
++>>>>>>> f17
  %doc %{gem_instdir}/TODO
  %doc %{gem_instdir}/LATEST
  %doc %{gem_instdir}/Rakefile
@@@ -95,22 -103,25 +135,37 @@@
  %doc %{gem_instdir}/test
  
  %files
++<<<<<<< HEAD
 +%{ruby_vendorarchdir}/kgio_ext.so
 +%dir %{gem_instdir}
 +%dir %{gem_libdir}
++=======
+ %{gem_extdir}
+ %dir %{gem_instdir}
+ %dir %{gem_instdir}/lib
++>>>>>>> f17
  %doc %{gem_instdir}/LICENSE
  %doc %{gem_instdir}/COPYING
  %doc %{gem_instdir}/README
  %doc %{gem_instdir}/NEWS
  %doc %{gem_instdir}/ChangeLog
  %{gem_cache}
++<<<<<<< HEAD
 +%{gem_spec}
 +%{gem_libdir}/kgio.rb
++=======
+ %{gem_spec} 
+ %{gem_instdir}/lib/kgio.rb
++>>>>>>> f17
  
  %changelog
+ * Sun Feb 12 2012 Guillermo Gómez <guillermo.gomez at gmail.com> - 2.7.0-5
+ - Proper use of new macros for Ruby 1.9 packaging
+ - irb added as build require
+ 
  * Tue Jan 07 2012 Guillermo Gómez <guillermo.gomez at gmail.com> - 2.7.0-4
  - Requires fixed for Ruby 1.9
 +- Spec file adjusted to use new macros
  
  * Sun Jan 01 2012 Guillermo Gómez <guillermo.gomez at gmail.com> - 2.7.0-3
  - Path to kgio_ext.so at spec file check section fixed