[kdelibs] drop unused/upstream patches better knewstuff2_gpg2 patch

[Rex Dieter]

commit e942d00083dc435ae0934812697102bf26d30315
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 6 11:37:09 2011 -0500

    drop unused/upstream patches
    better knewstuff2_gpg2 patch

 kdelibs-4.5.1-knewstuff_gpg2.patch    |   78 ---------------------------------
 kdelibs-4.6.90-kate.patch             |   25 ----------
 kdelibs-4.6.95-khtml-kde#277457.patch |   59 -------------------------
 kdelibs-4.7.0-knewstuff2_gpg2.patch   |   60 +++++++++++++++++++++++++
 kdelibs.spec                          |   15 ++-----
 5 files changed, 64 insertions(+), 173 deletions(-)
---
diff --git a/kdelibs-4.7.0-knewstuff2_gpg2.patch b/kdelibs-4.7.0-knewstuff2_gpg2.patch
new file mode 100644
index 0000000..35a5e8e
--- /dev/null
+++ b/kdelibs-4.7.0-knewstuff2_gpg2.patch
@@ -0,0 +1,60 @@
+diff -up kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp
+--- kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2	2011-05-20 15:24:54.000000000 -0500
++++ kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp	2011-09-06 11:29:18.939251150 -0500
+@@ -36,9 +36,20 @@
+ #include <kmessagebox.h>
+ #include <kpassworddialog.h>
+ #include <kprocess.h>
++#include <kstandarddirs.h>
+ 
+ using namespace KNS;
+ 
++static QString gpgExecutable()
++{
++  QString gpgExe = KStandardDirs::findExe( "gpg" );
++  if ( gpgExe.isEmpty() )
++    gpgExe = KStandardDirs::findExe( "gpg2" );
++  if ( gpgExe.isEmpty() )
++    return QLatin1String( "gpg" );
++  return gpgExe;
++}
++
+ Security::Security()
+ {
+     m_keysRead = false;
+@@ -61,7 +72,7 @@ void Security::readKeys()
+     m_runMode = List;
+     m_keys.clear();
+     m_process = new KProcess();
+-    *m_process << "gpg"
++    *m_process << gpgExecutable() 
+     << "--no-secmem-warning"
+     << "--no-tty"
+     << "--with-colon"
+@@ -87,7 +98,7 @@ void Security::readSecretKeys()
+     }
+     m_runMode = ListSecret;
+     m_process = new KProcess();
+-    *m_process << "gpg"
++    *m_process << gpgExecutable() 
+     << "--no-secmem-warning"
+     << "--no-tty"
+     << "--with-colon"
+@@ -260,7 +271,7 @@ void Security::slotCheckValidity()
+ 
+     //verify the signature
+     m_process = new KProcess();
+-    *m_process << "gpg"
++    *m_process << gpgExecutable() 
+     << "--no-secmem-warning"
+     << "--status-fd=2"
+     << "--command-fd=0"
+@@ -342,7 +353,7 @@ void Security::slotSignFile()
+ 
+     //verify the signature
+     m_process = new KProcess();
+-    *m_process << "gpg"
++    *m_process << gpgExecutable() 
+     << "--no-secmem-warning"
+     << "--status-fd=2"
+     << "--command-fd=0"
diff --git a/kdelibs.spec b/kdelibs.spec
index 863a942..a5b2ba2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -113,20 +113,14 @@ Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
 Patch43: 0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch
 
 ## upstreamable
-# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
-# reverting to our past gnupg2-only setup.
-# TODO: try to use either gpg or gpg2, whichever is available
-Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
+# knewstuff2 variant of:
+# https://git.reviewboard.kde.org/r/102439/
+Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
 
 # https://bugs.kde.org/show_bug.cgi?id=269045
 # https://git.reviewboard.kde.org/r/101231/
 Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 
-# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
-# attachment (patch by Andrea Iacovitti)
-# https://bugs.kde.org/show_bug.cgi?id=277457#c2
-Patch52: kdelibs-4.6.95-khtml-kde#277457.patch
-
 ## upstream
 
 ## security fix
@@ -314,9 +308,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %endif
 
 # upstreamable patches
-%patch50 -p1 -b .knewstuff_gpg2
+%patch50 -p1 -b .knewstuff2_gpg2
 %patch51 -p1 -b .uri_mimetypes
-%patch52 -p1 -b .khtml-kde#277457
 
 # upstream patches