[rubygem-sequel/f16: 15/16] Merge branch 'master' into f16

[Alejandro Perez]

commit 157e469fa1e585fba626c0898353ffeffc93e656
Merge: 0a43554 49bc60b
Author: Alejandro Pérez <alejandro at probook.esource.homelinux.org>
Date:   Sun Dec 4 22:46:08 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	rubygem-sequel.spec

 .gitignore                |    2 +
 .project                  |   12 ++++++
 SOURCES/sequel-3.16.0.gem |  Bin 0 -> 672256 bytes
 SOURCES/sequel-3.20.0.gem |  Bin 0 -> 689152 bytes
 SOURCES/sequel-3.24.0.gem |  Bin 0 -> 735232 bytes
 SOURCES/sequel-3.28.0.gem |  Bin 0 -> 783360 bytes
 SPECS/rubygem-sequel.spec |   90 +++++++++++++++++++++++++++++++++++++++++++++
 rubygem-sequel.spec       |   20 +++++++++-
 sequel-3.28.0.gem         |  Bin 0 -> 783360 bytes
 sequel-3.30.0.gem         |  Bin 0 -> 824320 bytes
 10 files changed, 123 insertions(+), 1 deletions(-)
---
diff --cc rubygem-sequel.spec
index 012fc56,8b21e67..f670d54
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# Generated from sequel-3.24.0.gem by gem2rpm -*- rpm-spec -*-
++=======
+ # Generated from sequel-3.30.0.gem by gem2rpm -*- rpm-spec -*-
++>>>>>>> master
  %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
  %global gemdir %(/usr/bin/ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
  %global gemname sequel
@@@ -6,8 -6,8 +10,13 @@@
  
  Summary: The Database Toolkit for Ruby
  Name: rubygem-%{gemname}
++<<<<<<< HEAD
 +Version: 3.24.0
 +Release: 8%{?dist}
++=======
+ Version: 3.30.0
+ Release: 11%{?dist}
++>>>>>>> master
  Group: Development/Languages
  License: MIT
  URL: http://sequel.rubyforge.org
@@@ -64,6 -64,12 +73,15 @@@ rm -rf %{buildroot
  %doc %{geminstdir}/doc
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Sun Dec 04 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.30.0-11
+ - fix download path from rubygems.org
+ * Sun Dec 04 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.30.0-10
+ - Change version to current version 3.30.0
+ * Sun Oct 20 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.28.0-9
+ - Change version to current 2.28.0
++>>>>>>> master
  * Tue Sep 21 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.24.0-8
  - change version to 3.24.0
  * Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-7