[kdepim/f17] 4.8.5

[Rex Dieter]

commit e2f2df61d807a000f4ee4b135b51248295c254bf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 12:37:38 2012 -0500

    4.8.5

 .gitignore                                         |    1 +
 ..._r7382a9298b65c0a945012e7e29671ca671466118.diff |   30 ----------------
 ..._rdbb2f72f4745e00f53031965a9c10b2d6862bd54.diff |   22 ------------
 kdepim-4.8.4-filtering.patch                       |   36 --------------------
 kdepim.spec                                        |   19 +++--------
 sources                                            |    2 +-
 6 files changed, 7 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf40a99..742c7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdepim-4.8.3.tar.xz
 /kdepim-4.8.4.tar.xz
+/kdepim-4.8.5.tar.xz
diff --git a/kdepim.spec b/kdepim.spec
index 9ae89db..9ebaceb 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,8 +1,8 @@
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
-Version: 4.8.4
-Release: 4%{?dist}
+Version: 4.8.5
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,15 +22,6 @@ Patch0:  kdepim-4.5.85-install-headers.patch
 Patch2: kdepim-4.7.2-kmail-migration.patch
 
 ## upstream patches
-# https://projects.kde.org/projects/kde/kdepim/repository/revisions/8846d44b217108351c35f8afd883f72ee88388ec
-Patch100: kdepim-4.8.4-filtering.patch
-# Security fix
-# https://projects.kde.org/projects/kde/kdepim/repository/revisions/dbb2f72f4745e00f53031965a9c10b2d6862bd54
-Patch101: changeset_rdbb2f72f4745e00f53031965a9c10b2d6862bd54.diff 
-# kmail crash in QNetworkAccessHttpBackend
-# https://projects.kde.org/projects/kde/kdepim/repository/revisions/7382a9298b65c0a945012e7e29671ca671466118
-Patch102: changeset_r7382a9298b65c0a945012e7e29671ca671466118.diff
-
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -103,9 +94,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %patch0 -p1 -b .install-headers
 %patch2 -p1 -b .kmail-migration
-%patch100 -p1 -b .filtering
-%patch101 -p1 -b .webkit_security
-%patch102 -p1 -b .QNetworkAccessHttpBackend
 
 
 %build
@@ -230,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.5-1
+- 4.8.5
+
 * Mon Jul 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.4-4
 - webkit security patch
 - QNetworkAccessHttpBackend crash fix
diff --git a/sources b/sources
index ec5144d..577d06e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17f0bd3c55884c27cd7e1bb85eb9901f  kdepim-4.8.4.tar.xz
+74500f0fcc6441611d876a78d18ec68c  kdepim-4.8.5.tar.xz