From 21c51bfbdcf05b0e4ad7cf22438f43265b0dd9f4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 03 2010 11:32:37 +0000
Subject: sync w/devel


---

diff --git a/.cvsignore b/.cvsignore
index f5e40de..8186ea6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdegraphics-4.4.1.tar.bz2
+kdegraphics-4.4.2.tar.bz2
diff --git a/kdegraphics-4.4.2-qt47.patch b/kdegraphics-4.4.2-qt47.patch
new file mode 100644
index 0000000..cc3a170
--- /dev/null
+++ b/kdegraphics-4.4.2-qt47.patch
@@ -0,0 +1,12 @@
+diff -up kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp.qt47 kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp
+--- kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp.qt47	2010-01-06 10:59:15.000000000 -0600
++++ kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp	2010-04-01 23:29:25.465430293 -0500
+@@ -74,7 +74,7 @@ public:
+ 	};
+ 	NameFilter(SortedDirModel* model)
+ 	: AbstractSortedDirModelFilter(model)
+-	, mText(0)
++	, mText()
+ 	, mMode(Contains)
+ 	{}
+ 
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 81c1aa2..7c04c88 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -7,8 +7,8 @@
 
 Summary:        KDE Graphics Applications
 Epoch:          7
-Version:        4.4.1
-Release:        1%{?dist}
+Version:        4.4.2
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,6 +21,7 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{ve
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+Patch100: kdegraphics-4.4.2-qt47.patch
 
 %if 0%{?fedora}
 BuildRequires:  chmlib-devel
@@ -100,6 +101,8 @@ Summary: A kioslave for displaying WinHelp files
 %prep
 %setup -q -n kdegraphics-%{version}%{?alphatag}
 
+%patch100 -p1 -b .qt47
+
 
 %build
 mkdir -p %{_target_platform}
@@ -235,6 +238,12 @@ fi
 
 
 %changelog
+* Thu Apr 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.4.2-3
+- base qt47 patch on upstream fix in trunk/ instead
+
+* Mon Mar 29 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.4.2-1
+- 4.4.2
+
 * Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.4.1-1
 - 4.4.1
 
diff --git a/sources b/sources
index a4de596..98655b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f59b613714aae2ad57b03574f5db00f2  kdegraphics-4.4.1.tar.bz2
+0f65e42a0c90261b6be885c4cdc1b75c  kdegraphics-4.4.2.tar.bz2