From 8db013aa1cf678779cf41c3456df4feb4b50a0f8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 02 2014 21:52:11 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 0096dd8..6cfc53d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
-/qtruby-4.10.1.tar.xz
-/qtruby-4.10.2.tar.xz
-/qtruby-4.10.3.tar.xz
-/qtruby-4.10.4.tar.xz
-/qtruby-4.10.90.tar.xz
-/qtruby-4.10.95.tar.xz
-/qtruby-4.10.97.tar.xz
-/qtruby-4.11.0.tar.xz
-/qtruby-4.11.1.tar.xz
-/qtruby-4.11.2.tar.xz
 /qtruby-4.11.3.tar.xz
+/qtruby-4.11.90.tar.xz
+/qtruby-4.11.95.tar.xz
+/qtruby-4.11.97.tar.xz
+/qtruby-4.12.0.tar.xz
+/qtruby-4.12.1.tar.xz
+/qtruby-4.12.2.tar.xz
diff --git a/ruby-qt.spec b/ruby-qt.spec
index a13bd0e..1e36790 100644
--- a/ruby-qt.spec
+++ b/ruby-qt.spec
@@ -21,7 +21,7 @@
 
 Summary: Ruby bindings for Qt 4
 Name:    ruby-qt
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -129,6 +129,27 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
+- 4.12.2
+
+* Fri Jan 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-1
+- 4.12.1
+
+* Thu Dec 19 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-1
+- 4.12.0
+
+* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.97-1
+- 4.11.97
+
+* Thu Nov 21 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.95-1
+- 4.11.95
+
+* Fri Nov 15 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.90-1
+- 4.11.90
+
+* Fri Nov 08 2013 Rex Dieter <rdieter@fedoraproject.org> 4.11.3-2
+- rebuild (qscintilla)
+
 * Fri Nov 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.3-1
 - 4.11.3
 
diff --git a/sources b/sources
index 20704cb..75b9928 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfbd1e1083b8ea982b99f20177c6e199  qtruby-4.11.3.tar.xz
+a24d44cb1cc47cc23a4ad71f6b0ae95f  qtruby-4.12.2.tar.xz