From 5b61ea253e7b6165da03dabe80f84b2545aa7d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Tue, 11 Feb 2014 09:02:42 +0100
Subject: [PATCH] Update rubygem-mysql2 to 0.3.15-1

---
 .gitignore          |  1 +
 rubygem-mysql2.spec | 71 +++++++++++++++++++++++++--------------------
 sources             |  2 +-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e183c7..6c6ef6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mysql2-0.3.13.gem
+/mysql2-0.3.15.gem
diff --git a/rubygem-mysql2.spec b/rubygem-mysql2.spec
index 2f7b323..6e18624 100644
--- a/rubygem-mysql2.spec
+++ b/rubygem-mysql2.spec
@@ -1,8 +1,7 @@
-# Generated from mysql2-0.3.11.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name mysql2
 
 Name: rubygem-%{gem_name}
-Version: 0.3.13
+Version: 0.3.15
 Release: 1%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 Group: Development/Languages
@@ -10,22 +9,29 @@ License: MIT
 URL: http://github.com/brianmario/mysql2
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 Requires: ruby(release)
-Requires: ruby(rubygems)
-Requires: mariadb-libs
+Requires: ruby(rubygems) 
+Requires: mysql
 BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby-devel
-BuildRequires: rubygem(rspec)
-BuildRequires: mariadb-devel
-BuildRequires: mariadb-server
+BuildRequires: rubygems-devel 
+BuildRequires: ruby ruby-devel
+BuildRequires: mysql mysql-devel
 Provides: rubygem(%{gem_name}) = %{version}
 
 %description
-The Mysql2 gem is meant to serve the extremely common use-case of
-connecting, querying and iterating on results. Some database libraries
-out there serve as direct 1:1 mappings of the already complex C API\'s
-available. This one is not.
+The Mysql2 gem is meant to serve the extremely common use-case of connecting,
+querying and iterating on results. Some database libraries out there serve as
+direct 1:1 mappings of the already complex C API's available. This one is not.
 
+It also forces the use of UTF-8 [or binary] for the connection [and all strings
+in 1.9, unless Encoding.default_internal is set then it'll convert from UTF-8
+to that encoding] and uses encoding-aware MySQL API calls where it can.
+
+The API consists of two classes:
+
+Mysql2::Client - your connection to the database
+
+Mysql2::Result - returned from issuing a #query on the connection. It includes
+Enumerable.
 
 %package doc
 Summary: Documentation for %{name}
@@ -34,7 +40,7 @@ Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{name}.
 
 %prep
 gem unpack %{SOURCE0}
@@ -47,28 +53,20 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 # Create the gem as gem install only works on a gem file
 gem build %{gem_name}.gemspec
 
-# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
+# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir
 # by default, so that we can move it into the buildroot in %%install
 %gem_install
 
-
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{gem_extdir_mri}/lib/mysql2
-mv %{buildroot}%{gem_instdir}/lib/mysql2/mysql2.so %{buildroot}%{gem_extdir_mri}/lib/mysql2
+mv %{buildroot}%{gem_instdir}/lib/mysql2/mysql2.so %{buildroot}%{gem_extdir_mri}/lib/mysql2/
 
-# Remove some droppings
-rm -f %{buildroot}%{gem_instdir}/{.gitignore,.rspec,.rvmrc,.travis.yml}
-rm -rf %{buildroot}%{gem_instdir}/spec
-
-%check
-# We can't run the tests because they require a mysql instance. That's
-# a bit much to require for builds. The following invocation is documentation
-#systemctl start mysqld.service
-#rspec -I%%{buildroot}%%{gem_extdir_mri}/lib/ spec
+# Remove the binary extension sources and build leftovers.
+rm -rf %{buildroot}%{geminstdir}/ext
 
 
 %files
@@ -78,15 +76,24 @@ rm -rf %{buildroot}%{gem_instdir}/spec
 %{gem_extdir_mri}
 %exclude %{gem_cache}
 %{gem_spec}
-%exclude %{gem_instdir}/support
+%{gem_instdir}/support/
+%doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/MIT-LICENSE
 
+
 %files doc
 %doc %{gem_docdir}
-%doc %{gem_instdir}/README.md
-%{gem_instdir}/examples
-
+%{gem_instdir}/spec/
+%{gem_instdir}/examples/
 
 %changelog
-* Wed Sep 11 2013 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.13-1
-- Initial package
+* Tue Feb 11 2014 Miroslav Suchý <msuchy@redhat.com> 0.3.15-1
+- rebase to mysql2-0.3.15
+
+* Mon Jul 29 2013 Miroslav Suchý <msuchy@redhat.com> 0.3.13-3
+- fix files section
+- move extension
+
+* Fri Jul 26 2013 Miroslav Suchý <msuchy@redhat.com> 0.3.13-2
+- initial package
+
diff --git a/sources b/sources
index 3af5722..84b2874 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee8dfc03421a1db9f6147d2efde7ced8  mysql2-0.3.13.gem
+c317fc0dc8e2b409f13fe045fa665dd7  mysql2-0.3.15.gem