[kdelibs] drop upstreamed qt48 patch
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 8 19:05:18 UTC 2011
commit 814559fc88eac4da49f0f4969578b988d8a41f07
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jul 8 14:09:59 2011 -0500
drop upstreamed qt48 patch
oddly this patch was still applying, though at a large offset, wtf?
kdelibs-4.6.90-kconfigxt-qt48.patch | 21 ---------------------
kdelibs.spec | 9 ++++-----
2 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 333fca1..7acef0d 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -13,7 +13,7 @@
Summary: KDE Libraries
Version: 4.6.95
-Release: 1%{?dist}
+Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@@ -105,9 +105,6 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
## upstream
-# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
-# fix KConfigXT KComboBox for Qt 4.8 TP1
-Patch100: kdelibs-4.6.90-kconfigxt-qt48.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@@ -301,7 +298,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch51 -p1 -b .uri_mimetypes
# upstream patches
-%patch100 -p1 -b .kconfigxt-qt48
# security fix
%patch200 -p1 -b .CVE-2009-2702
@@ -556,6 +552,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jul 08 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-2
+- drop upstreamed qt48 patch
+
* Fri Jul 08 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.95-1
- 4.6.95 (rc2)
More information about the scm-commits
mailing list