[qt] - apply the Assistant QtWebKit dependency removal (#660287) everywhere

Rex Dieter rdieter at fedoraproject.org
Thu Jan 20 15:05:00 UTC 2011


commit 34a50271abe6b5104cf832f42ddbf8a839c68833
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 20 09:04:20 2011 -0600

    - apply the Assistant QtWebKit dependency removal (#660287) everywhere

 qt.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/qt.spec b/qt.spec
index 5eb0417..db08198 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.1
-Release: 9%{?dist}
+Release: 9%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -442,9 +442,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 #patch16 -p1 -b .kde4_plugins
 %patch19 -p1 -b .phonon_servicesfile
 %patch23 -p1 -b .glib_eventloop_nullcheck
-%if 0%{?fedora} > 14
 %patch24 -p1 -b .webkit
-%endif
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
@@ -1132,6 +1130,9 @@ fi
 
 
 %changelog
+* Thu Jan 20 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.1-9.1
+- apply the Assistant QtWebKit dependency removal (#660287) everywhere
+
 * Thu Jan 06 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.1-9
 - qsortfilterproxymodel fix (merge_request/934)
 


More information about the scm-commits mailing list