rpms/kdelibs/devel kdelibs-4.4.90-icon-name-qt47.patch, NONE, 1.1 .cvsignore, 1.95, 1.96 kdelibs.spec, 1.638, 1.639 sources, 1.114, 1.115 kdelibs-4.4.80-icon-name-qt47.patch, 1.2, NONE kdelibs-4.4.85-kdebug241298.patch, 1.1, NONE

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9802

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.4.90-icon-name-qt47.patch 
Removed Files:
	kdelibs-4.4.80-icon-name-qt47.patch 
	kdelibs-4.4.85-kdebug241298.patch 
Log Message:
* Fri Jun 25 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.90-1
- 4.5 RC1 (4.4.90)

rebased icon-name-qt47, removed kdebug241298


kdelibs-4.4.90-icon-name-qt47.patch:
 kstatusnotifieritem.cpp |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE kdelibs-4.4.90-icon-name-qt47.patch ---
diff -up kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp
--- kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47	2010-06-16 14:03:39.000000000 +0200
+++ kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp	2010-06-25 13:07:34.527335200 +0200
@@ -65,12 +65,6 @@ protected:
     virtual QString iconNameForAction(QAction *action)
     {
         KIcon icon(action->icon());
-#if QT_VERSION >= 0x040700
-        // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
-        // If you get a build error here, you need to update your pre-release
-        // of Qt 4.7.
-        return icon.isNull() ? QString() : icon.name();
-#else
         // Qt 4.6: If the icon was created by us, via our engine, serializing it
         // will let us get to the name.
         if (!icon.isNull()) {
@@ -94,7 +88,6 @@ protected:
         }
         
         return QString();
-#endif
     }
 };
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	7 Jun 2010 14:11:10 -0000	1.95
+++ .cvsignore	25 Jun 2010 11:14:29 -0000	1.96
@@ -1 +1 @@
-kdelibs-4.4.85.tar.bz2
+kdelibs-4.4.90.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -p -r1.638 -r1.639
--- kdelibs.spec	17 Jun 2010 18:06:45 -0000	1.638
+++ kdelibs.spec	25 Jun 2010 11:14:38 -0000	1.639
@@ -7,8 +7,8 @@
 %define apidocs 1
 
 Summary: KDE Libraries
-Version: 4.4.85
-Release: 3%{?dist}
+Version: 4.4.90
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -75,15 +75,13 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch27: kdelibs-4.4.80-no_rpath.patch
 # TEMPORARY WORKAROUND! QIcon::name() does not exists in Qt 4.7 TP
 # TODO: remove by final Qt 4.7!!!
-Patch28: kdelibs-4.4.80-icon-name-qt47.patch
+Patch28: kdelibs-4.4.90-icon-name-qt47.patch
 
 # upstreamable
 
 ## 4.4 upstream
 
 ## trunk upstream
-# https://bugs.kde.org/241298
-Patch100: kdelibs-4.4.85-kdebug241298.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -234,7 +232,6 @@ format for easy browsing.
 # upstreamable patches
 
 # upstream patches
-%patch100 -p3 -b .kdebug241298
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -450,6 +447,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 25 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.90-1
+- 4.5 RC1 (4.4.90)
+
 * Thu Jun 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.85-3
 - Plasma crash on startup (kde#241298)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	7 Jun 2010 14:11:11 -0000	1.114
+++ sources	25 Jun 2010 11:14:38 -0000	1.115
@@ -1 +1 @@
-0a7d40cc1c98958982a02ee31cac3871  kdelibs-4.4.85.tar.bz2
+c19cc1a2488fd7fd5543ff0061de9087  kdelibs-4.4.90.tar.bz2


--- kdelibs-4.4.80-icon-name-qt47.patch DELETED ---


--- kdelibs-4.4.85-kdebug241298.patch DELETED ---