[rubygem-sequel/f18] fix merge

[Alejandro Perez]

commit 4dd145c22bd76e3c0121065a759bc4f46b2602eb
Author: alejandro <alejandro at dejami.com>
Date:   Tue Jan 15 23:56:46 2013 -0500

    fix merge

 .gitignore          |    1 +
 rubygem-sequel.spec |   36 +++++++++++++++++++++++++-----------
 sources             |    2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d3fd2d..475136d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ SOURCES/sequel-3.24.0.gem
 /sequel-3.30.0.gem
 /sequel-3.31.0.gem
 /sequel-3.42.0.gem
+/sequel-3.43.0.gem
diff --git a/rubygem-sequel.spec b/rubygem-sequel.spec
index 491434a..982ad2b 100644
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@ -1,17 +1,18 @@
-# Generated from sequel-3.42.0.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name sequel
 
 Summary: The Database Toolkit for Ruby
 Name: rubygem-%{gem_name}
-Version: 3.42.0
-Release: 1%{?dist}
+Version: 3.43.0
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://sequel.rubyforge.org
 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: ruby
 Requires: ruby(abi) = 1.9.1
 Requires: ruby(rubygems)
+BuildRequires: ruby-devel
 BuildRequires: rubygems-devel
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
@@ -30,18 +31,30 @@ This package contains documentation for %{name}.
 
 
 %prep
+gem unpack %{SOURCE0}
+%setup -q -D -T -n %{gem_name}-%{version}
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 %build
+mkdir -p ./%{gem_dir}
+gem build %{gem_name}.gemspec
+#buildroot in %%install 
+gem install -V \
+        --local \
+        --install-dir ./%{gem_dir} \
+        --force \
+        --rdoc  \
+        %{gem_name}-%{version}.gem
 
+<<<<<<< HEAD
 %install 
 rm -rf %{buildroot}
+=======
+%install
+>>>>>>> master
 mkdir -p %{buildroot}%{gem_dir}
-/usr/bin/gem install --local --install-dir %{buildroot}%{gem_dir} \
-            --force --rdoc %{SOURCE0}
-mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gem_dir}/bin
-find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
+find %{buildroot}%{gem_dir}/gems/%{gem_name}-%{version}/bin -type f | xargs chmod a+x
 chmod a+x %{buildroot}%{gem_instdir}/spec/adapters/db2_spec.rb 
 
 %clean
@@ -49,7 +62,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%{_bindir}/sequel
+%{gem_dir}/bin/sequel
 %doc %{gem_instdir}/README.rdoc
 %doc %{gem_instdir}/CHANGELOG
 %{gem_dir}/gems/%{gem_name}-%{version}/
@@ -62,5 +75,6 @@ rm -rf %{buildroot}
 %doc %{gem_instdir}/doc
 
 %changelog
-* Tue Dec 4 2012 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.42.0-1
+* Thu Jan 10 2012 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.43.0-2
+- Update the change log
 - Initial package
diff --git a/sources b/sources
index dcf7b5e..3219d21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d9da4ff5ba3bc916aa1ad17215c1a30  sequel-3.42.0.gem
+09b0cc6da2de395984338d78b38208be  sequel-3.43.0.gem