rpms/kdegraphics/F-11 kdegraphics-4.4.2-qt47.patch, NONE, 1.1 .cvsignore, 1.69, 1.70 kdegraphics.spec, 1.213, 1.214 sources, 1.75, 1.76

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13691/F-11

Modified Files:
	.cvsignore kdegraphics.spec sources 
Added Files:
	kdegraphics-4.4.2-qt47.patch 
Log Message:
sync w/devel


kdegraphics-4.4.2-qt47.patch:
 filtercontroller.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdegraphics-4.4.2-qt47.patch ---
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)
 	{}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	2 Mar 2010 14:01:41 -0000	1.69
+++ .cvsignore	3 Apr 2010 11:32:36 -0000	1.70
@@ -1 +1 @@
-kdegraphics-4.4.1.tar.bz2
+kdegraphics-4.4.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdegraphics.spec	2 Mar 2010 14:01:41 -0000	1.213
+++ kdegraphics.spec	3 Apr 2010 11:32:37 -0000	1.214
@@ -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/kd
 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 WinHe
 %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 at fedoraproject.org> - 4.4.2-3
+- base qt47 patch on upstream fix in trunk/ instead
+
+* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
+- 4.4.2
+
 * Sat Feb 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-1
 - 4.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	2 Mar 2010 14:01:41 -0000	1.75
+++ sources	3 Apr 2010 11:32:37 -0000	1.76
@@ -1 +1 @@
-f59b613714aae2ad57b03574f5db00f2  kdegraphics-4.4.1.tar.bz2
+0f65e42a0c90261b6be885c4cdc1b75c  kdegraphics-4.4.2.tar.bz2