rpms/kdepim/F-11 kdepim-4.2.patch,NONE,1.1 kdepim.spec,1.217,1.218

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27793

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.patch 
Log Message:
fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)


kdepim-4.2.patch:

--- NEW FILE kdepim-4.2.patch ---
--- kleopatra/main.cpp	(revision 986647)
+++ kleopatra/main.cpp	(revision 986648)
@@ -77,2 +77,4 @@
 
+#include <gpgme++/global.h>
+
 #include <boost/shared_ptr.hpp>
@@ -155,2 +157,4 @@
 
+    GpgME::initializeLibrary();
+
   {
--- libkleo/backends/qgpgme/qgpgmebackend.cpp	(revision 986649)
+++ libkleo/backends/qgpgme/qgpgmebackend.cpp	(revision 986650)
@@ -282,3 +282,3 @@
 {
-
+  GpgME::initializeLibrary();
 }


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- kdepim.spec	31 May 2009 15:21:26 -0000	1.217
+++ kdepim.spec	26 Jun 2009 10:47:47 -0000	1.218
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -14,6 +14,9 @@ URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # 4.2 upstream patches
+# Patch100, GPGME 1.2.0 will break crypto in kdepim,
+# https://bugs.kde.org/show_bug.cgi?id=197458
+Patch100: kdepim-4.2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -88,7 +91,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
-# upstream patches
+# 4.2 upstream patches
+%patch100 -p0 -b .kde197458
 
 %build
 mkdir -p %{_target_platform}
@@ -185,6 +189,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
+- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+
 * Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4