[kdepim/f17: 19/19] Merge branch 'master' into f17

[Rex Dieter]

commit 4b639ee3bc115291d59e6ee99426147ffd8d2e49
Merge: 1e64511 3ba1f22
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 12:04:29 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kdepim.spec
    	sources

 .gitignore                                         |    5 +
 ..._r628faec2651f6f20a438f61fc9c861c0d5eab0f8.diff |   22 -----
 ..._rbb773366167af50fc99025473dc20ab5ab41e1cc.diff |   35 --------
 kdepim-4.7.2-kmail-migration.patch                 |   27 ------
 kdepim.spec                                        |   86 +++++++++++++++-----
 sources                                            |    4 +
 6 files changed, 74 insertions(+), 105 deletions(-)
---
diff --cc .gitignore
index 742c7c9,b5c01e4..f88f7f6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,2 +1,8 @@@
++<<<<<<< HEAD
 +/kdepim-4.8.3.tar.xz
 +/kdepim-4.8.4.tar.xz
 +/kdepim-4.8.5.tar.xz
++=======
+ /kdepim-4.8.5.tar.xz
+ /kdepim-4.9.1.tar.xz
++>>>>>>> master
diff --cc kdepim.spec
index 3701d68,7f489d7..27b37b3
--- a/kdepim.spec
+++ b/kdepim.spec
@@@ -1,11 -1,10 +1,15 @@@
  Name:    kdepim
  Summary: KDE PIM (Personal Information Manager) applications
  Epoch:   7
++<<<<<<< HEAD
 +Version: 4.8.5
 +Release: 4%{?dist}
++=======
+ Version: 4.9.1
+ Release: 1%{?dist}
++>>>>>>> master
  
  License: GPLv2
- Group:   Applications/Productivity
  URL:     http://www.kde.org/
  %global revision %(echo %{version} | cut -d. -f3)
  %if %{revision} >= 50
@@@ -18,15 -17,7 +22,19 @@@ Source0: http://download.kde.org/%{stab
  # revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
  Patch0:  kdepim-4.5.85-install-headers.patch
  
++<<<<<<< HEAD
 +# fix KMail migration (kde#283563)
 +Patch2: kdepim-4.7.2-kmail-migration.patch
 +
 +## upstream patches
 +# fix ktimetracker
 +Patch100: changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff
 +# https://projects.kde.org/projects/kde/kdepim/repository/revisions/628faec2651f6f20a438f61fc9c861c0d5eab0f8
 +# "filtering removes email's content "https://bugs.kde.org/295484 
 +Patch101: changeset_r628faec2651f6f20a438f61fc9c861c0d5eab0f8.diff
++=======
+ ## upstream patches
++>>>>>>> master
  
  Provides: kdepim4 = %{version}-%{release}
  
@@@ -99,9 -89,6 +106,12 @@@ Requires: %{name}-libs%{?_isa} = %{?epo
  %setup -q -n kdepim-%{version}%{?pre}
  
  %patch0 -p1 -b .install-headers
++<<<<<<< HEAD
 +%patch2 -p1 -b .kmail-migration
 +%patch100 -p1 -b .ktimetracker
 +%patch101 -p1 -b .filtering_removes_content
++=======
++>>>>>>> master
  
  
  %build
@@@ -226,30 -207,43 +230,70 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
 +* Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.5-4
 +- BR: prison-devel
 +
 +* Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.5-3
 +- filtering removes email's content (kde#295484)
 +
 +* Fri Aug 17 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.8.5-2
 +- Resolves: #813257 - Ktimetracker shows only an empty window
 +
 +* 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
 +
 +* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.4-3
 +- upstream filtering patch
 +
 +* Thu Jun 07 2012 Lukáš Tinkl <ltinkl at redhat.com> - 6:4.8.4-2
 +- respin
 +
 +* Mon Jun 04 2012 Than Ngo <than at redhat.com> - 7:4.8.4-1
 +- 4.8.4
++=======
+ * Mon Sep 03 2012 Than Ngo <than at redhat.com> - 7:4.9.1-1
+ - 4.9.1
+ 
+ * Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.9.0-4
+ - BR: prison-devel
+ 
+ * Sat Aug 25 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.9.0-3
+ - filtering removes email's content (kde#295484)
+ 
+ * Fri Aug 17 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.9.0-2
+ - Resolves: #813257 - Ktimetracker shows only an empty window
+ 
+ * Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.9.0-1
+ - 4.9.0
+ 
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.8.97-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Thu Jul 12 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.97-1
+ - 4.8.97
+ 
+ * Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.95-3
+ - .spec cleanup
+ 
+ * Thu Jul 05 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.95-2
+ - upstream filter-rework patch
+ 
+ * Wed Jun 27 2012 Jaroslav Reznik <jreznik at redhat.com> - 7:4.8.95-1
+ - 4.8.95
+ 
+ * Sat Jun 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.90-1
+ - 4.8.90
+ 
+ * Sun Jun 03 2012 Jaroslav Reznik <jreznik at redhat.com> - 7:4.8.80-1
+ - 4.8.80
+ - add locolor icons again
+ - fix appsdir filelist
++>>>>>>> master
  
  * Mon Apr 30 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.3-2
  - s/kdebase-runtime/kde-runtime/
diff --cc sources
index 577d06e,bffddc6..815c61d
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +74500f0fcc6441611d876a78d18ec68c  kdepim-4.8.5.tar.xz
++=======
+ 79d73b46fe53c19924657ecc01fe4729  kdepim-4.9.1.tar.xz
++>>>>>>> master