[kdelibs/f17] drop patches which are already included in new upstream

Than Ngo than at fedoraproject.org
Tue Jun 5 17:19:52 UTC 2012


commit a2a7df74a9bcba3f60d8e8e3b2d2bb1a356ff06e
Author: Than Ngo <than at redhat.com>
Date:   Tue Jun 5 19:19:20 2012 +0200

    drop patches which are already included in new upstream

 kdelibs-4.8.3-kmessagewidget_colors.patch         |  103 ---------------------
 kdelibs-4.8.3-kmessagewidget_heightForWidth.patch |   37 --------
 kdelibs-4.8.3-kmessagewidget_icon_position.patch  |   22 -----
 kdelibs-4.8.3-kmessagewidget_resizeEvent.patch    |   54 -----------
 kdelibs-4.8.3-kmessagewidget_unbreak_abi.patch    |   42 ---------
 kdelibs.spec                                      |   12 ---
 6 files changed, 0 insertions(+), 270 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index e035c97..8b20192 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -146,13 +146,6 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
 # fix kdeclarative install location (by wstephenson as found in kde-packager list)
 Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
 
-# a bunch of kmessagewidget fixes
-Patch101: kdelibs-4.8.3-kmessagewidget_resizeEvent.patch
-Patch102: kdelibs-4.8.3-kmessagewidget_heightForWidth.patch
-Patch103: kdelibs-4.8.3-kmessagewidget_colors.patch
-Patch104: kdelibs-4.8.3-kmessagewidget_icon_position.patch
-Patch106: kdelibs-4.8.3-kmessagewidget_unbreak_abi.patch
-
 ## security fix
 # Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -362,11 +355,6 @@ popd
 
 # upstream patches
 %patch100 -p1 -b .kdeclarative-install-location
-%patch101 -p1 -b .kmessagewidget_resizeEvent
-%patch102 -p1 -b .kmessagewidget_heightForWidth
-%patch103 -p1 -b .kmessagewidget_colors
-%patch104 -p1 -b .kmessagewidget_icon_position
-%patch106 -p1 -b .kmessagewidget_unbreak_abi
 
 # security fixes
 %patch200 -p1 -b .CVE-2009-2702


More information about the scm-commits mailing list