From c9b221726b0ee118994be34117300caeb57a52e8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 01 2010 10:18:05 +0000 Subject: drop upstreamed patch --- diff --git a/kdegraphics-4.4.2-qt47.patch b/kdegraphics-4.4.2-qt47.patch deleted file mode 100644 index cc3a170..0000000 --- a/kdegraphics-4.4.2-qt47.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp.qt47 kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp ---- kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp.qt47 2010-01-06 10:59:15.000000000 -0600 -+++ kdegraphics-4.4.2/gwenview/app/filtercontroller.cpp 2010-04-01 23:29:25.465430293 -0500 -@@ -74,7 +74,7 @@ public: - }; - NameFilter(SortedDirModel* model) - : AbstractSortedDirModelFilter(model) -- , mText(0) -+ , mText() - , mMode(Contains) - {} - diff --git a/kdegraphics.spec b/kdegraphics.spec index 4d71c10..b54a77c 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -21,7 +21,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{ve BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches -Patch100: kdegraphics-4.4.2-qt47.patch %if 0%{?fedora} BuildRequires: chmlib-devel @@ -101,8 +100,6 @@ Summary: A kioslave for displaying WinHelp files %prep %setup -q -n kdegraphics-%{version}%{?alphatag} -%patch100 -p1 -b .qt47 - %build mkdir -p %{_target_platform}