[kdebase-runtime] 4.7.3 drop QUrl hack/workaround

Rex Dieter rdieter at fedoraproject.org
Sat Oct 29 14:33:19 UTC 2011


commit 5c30ef7af00f7beb261c792d9cd6818f1e287ed2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 29 09:40:44 2011 -0500

    4.7.3
    drop QUrl hack/workaround

 .gitignore                                |    1 +
 kde-runtime-4.7.2-knotify_qt48_qurl.patch |   17 -----------------
 kdebase-runtime.spec                      |   14 +++++++-------
 sources                                   |    2 +-
 4 files changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf40b9a..5ea3abd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kde-runtime-4.7.2.tar.bz2
+/kde-runtime-4.7.3.tar.bz2
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index b128c25..183f358 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -13,8 +13,8 @@
 
 Name:          kdebase-runtime
 Summary:       KDE Runtime
-Version:       4.7.2
-Release:       6%{?dist}
+Version:       4.7.3
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -46,9 +46,6 @@ Patch9:        kdebase-runtime-4.3.4-man-overrides.patch
 Patch10: kde-runtime-4.7.2-no_activitymanager.patch
 
 ## upstreamable patches
-# workaround Qt 4.8 QUrl.toLocalFile behavior change
-# http://bugzilla.redhat.com/749213
-Patch50: kde-runtime-4.7.2-knotify_qt48_qurl.patch 
 
 ## upstream patches
 
@@ -84,11 +81,11 @@ Requires: oxygen-icon-theme >= %{version}
 BuildRequires: bzip2-devel
 BuildRequires: chrpath
 BuildRequires: clucene-core-devel
-BuildRequires: pkgconfig(exiv2)
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(exiv2)
 BuildRequires: pkgconfig(libssh)
 BuildRequires: pkgconfig(OpenEXR)
 BuildRequires: pkgconfig(openssl)
@@ -156,7 +153,6 @@ BuildArch: noarch
 %if 0%{?no_activitymanager}
 %patch10 -p1 -b .no_activitymanager
 %endif
-%patch50 -p1 -b .knotify_qt48_qurl
 
 
 %build
@@ -311,6 +307,10 @@ fi
 
 
 %changelog
+* Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-1
+- 4.7.3
+- drop QUrl hack/workaround
+
 * Wed Oct 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-6
 - fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213)
 
diff --git a/sources b/sources
index 19670de..1835ebf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16b11a96a7ad0b3c0a7175beb1fa943f  kde-runtime-4.7.2.tar.bz2
+1b80879c37e7ab1d23e224d687e8e630  kde-runtime-4.7.3.tar.bz2


More information about the scm-commits mailing list