From a131b788777c030ece69a5d76158f38231e0a5c3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 04 2012 20:16:33 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	pykde4.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 9c73428..eb32c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/pykde4-4.8.3.tar.xz
-/pykde4-4.8.4.tar.xz
 /pykde4-4.8.5.tar.xz
+/pykde4-4.9.1.tar.xz
diff --git a/pykde4.spec b/pykde4.spec
index 41ecfe7..56e999d 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -2,9 +2,12 @@
 %define pyqt4_version_min 4.8.2
 %define sip_version_min 4.12
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+## python3 support
+# https://bugs.kde.org/275919
+#define python3 1
 
 Name:    pykde4 
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 Summary: Python bindings for KDE4 
 
@@ -256,11 +259,26 @@ 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 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 Jaroslav Reznik <jreznik@redhat.com> - 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 May 14 2012 Than Ngo <than@redhat.com> 4.8.3-3
 - add rhel condition
diff --git a/sources b/sources
index f5d87e1..114ad19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c2002515dd61315afae6d8b5fabc9f0  pykde4-4.8.5.tar.xz
+51e77a113ca740046d520460bb83dca6  pykde4-4.9.1.tar.xz