rpms/kdepimlibs/F-10 kdepimlibs_4.2.patch, NONE, 1.1 kdepimlibs.spec, 1.68, 1.69

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30831

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


kdepimlibs_4.2.patch:

--- NEW FILE kdepimlibs_4.2.patch ---
--- gpgme++/context.cpp	(revision 986644)
+++ gpgme++/context.cpp	(revision 986645)
@@ -53,2 +53,6 @@
 namespace GpgME {
+  void initializeLibrary() {
+      gpgme_check_version( 0 );
+  }
+
   static inline gpgme_error_t makeError( gpg_err_code_t code ) {
--- gpgme++/CMakeLists.txt	(revision 986644)
+++ gpgme++/CMakeLists.txt	(revision 986645)
@@ -34,3 +34,3 @@
 
-set( _gpgmepp_version 2.0.2 )
+set( _gpgmepp_version 2.0.3 )
 set( _gpgmepp_soversion 2 )
--- gpgme++/global.h	(revision 986645)
+++ gpgme++/global.h	(revision 986647)
@@ -39,6 +39,8 @@
 
 namespace GpgME {
 
+    GPGMEPP_EXPORT void initializeLibrary();
+
     enum Protocol { OpenPGP, CMS, UnknownProtocol };
 
     enum Engine { GpgEngine, GpgSMEngine, GpgConfEngine, UnknownEngine };


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- kdepimlibs.spec	31 May 2009 14:03:54 -0000	1.68
+++ kdepimlibs.spec	26 Jun 2009 11:01:45 -0000	1.69
@@ -15,7 +15,7 @@
 
 Name: kdepimlibs
 Version: 4.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -23,6 +23,11 @@ Group: System Environment/Libraries
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+# 4.2 upstream patches
+# Patch100, GPGME 1.2.0 will break crypto in kdepim,
+# https://bugs.kde.org/show_bug.cgi?id=197458
+Patch100: kdepimlibs_4.2.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
@@ -93,6 +98,8 @@ format for easy browsing.
 %prep
 %setup -q -n kdepimlibs-%{version}
 
+#upstream patches
+%patch100 -p0 -b .kde#197458
 
 %build
 mkdir -p %{_target_platform}
@@ -211,6 +218,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)
+
 * Sun May 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4