[kdelibs] omit knotify hack, fix in qt instead
Rex Dieter
rdieter at fedoraproject.org
Sat Oct 29 03:35:12 UTC 2011
commit 28f81c0ef4f6e11aef3e3c4a03337a6d55cc93a6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 28 22:42:37 2011 -0500
omit knotify hack, fix in qt instead
kdelibs-4.7.2-knotify_qt48_qurl.patch | 16 ----------------
kdelibs.spec | 10 ++++------
2 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 27623fd..3859ed4 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -23,7 +23,7 @@
Summary: KDE Libraries
Version: 4.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@@ -124,10 +124,6 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
# https://git.reviewboard.kde.org/r/101231/
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
-# workaround Qt 4.8 QUrl.toLocalFile behavior change
-# http://bugzilla.redhat.com/749213
-Patch52: kdelibs-4.7.2-knotify_qt48_qurl.patch
-
## upstream
# fix nepomuk queries *not* using wide-unicode
Patch100: kdelibs-4.7.2-nepomuk_unicode.patch
@@ -323,7 +319,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
%patch51 -p1 -b .uri_mimetypes
-%patch52 -p1 -b .knotify_qt48_qurl
# upstream patches
%patch100 -p1 -b .nepomuk_unicode
@@ -579,6 +574,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Oct 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-5
+- omit knotify hack, fix in qt instead
+
* Wed Oct 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-4
- fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213)
More information about the scm-commits
mailing list