From 01e19d88e43931aa7922fc06eb549b6e4aebbb30 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 05 2012 15:29:26 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	ruby-qt.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 13ce567..c757815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/qtruby-4.8.3.tar.xz
-/qtruby-4.8.4.tar.xz
 /qtruby-4.8.5.tar.xz
+/qtruby-4.9.1.tar.xz
diff --git a/ruby-qt.spec b/ruby-qt.spec
index 3449ab6..3308331 100644
--- a/ruby-qt.spec
+++ b/ruby-qt.spec
@@ -8,7 +8,7 @@
 
 Summary: Ruby bindings for Qt 4
 Name:    ruby-qt
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -29,7 +29,7 @@ BuildRequires: pkgconfig(QtCore) pkgconfig(QtScript) pkgconfig(QtTest) pkgconfig
 BuildRequires: pkgconfig(QtWebKit)
 BuildRequires: ruby-devel ruby
 BuildRequires: qscintilla-devel
-BuildRequires: qwt-devel
+BuildRequires: qwt5-qt4-devel
 BuildRequires: smokeqt-devel >= %{version}
 
 Obsoletes: QtRuby < 4.7.0
@@ -128,11 +128,30 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
-- 4.8.5
+* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 4.9.1-1
+- 4.9.1
 
-* Tue Jun 05 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.0-2
+- cleaner ruby macro usage wrt vendor/site dirs
+- s/qwt-devel/qwt5-qt4/
+
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jul 11 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.97-1
+- 4.8.97
+
+* Wed Jun 27 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.95-1
+- 4.8.95
+
+* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
+
+* Tue May 29 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.80-1
+- 4.8.80
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
 - 4.8.3
diff --git a/sources b/sources
index ab28688..32d9fa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f90c908ddbd4ed9941bc2bce1c1be4f6  qtruby-4.8.5.tar.xz
+34df5457d454e157719aa126778eb863  qtruby-4.9.1.tar.xz