diff --git a/kdelibs-4.5.1-knewstuff_gpg2.patch b/kdelibs-4.5.1-knewstuff_gpg2.patch new file mode 100644 index 0000000..4244642 --- /dev/null +++ b/kdelibs-4.5.1-knewstuff_gpg2.patch @@ -0,0 +1,78 @@ +diff -up kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp +--- kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 2009-11-30 18:27:20.000000000 -0600 ++++ kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp 2010-08-27 10:49:10.619703933 -0500 +@@ -61,7 +61,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +87,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -258,7 +258,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -340,7 +340,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +diff -up kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp +--- kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 2009-11-30 18:27:19.000000000 -0600 ++++ kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp 2010-08-27 10:49:50.493454042 -0500 +@@ -61,7 +61,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +87,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -258,7 +258,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -340,7 +340,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << "gpg2" + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" diff --git a/kdelibs.spec b/kdelibs.spec index c9c9cf5..4a2ff5e 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -81,7 +81,11 @@ Patch24: kdelibs-4.3.1-drkonq.patch # -DCMAKE_SKIP_RPATH:BOOL=ON (finally) Patch27: kdelibs-4.4.80-no_rpath.patch -# upstreamable +## 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 ## 4.4 upstream @@ -247,6 +251,7 @@ format for use with the Qt 4 Assistant or KDevelop 4. %patch27 -p1 -b .no_rpath # upstreamable patches +%patch50 -p1 -b .knewstuff_gpg2 # upstream patches @@ -489,6 +494,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 27 2010 Jaroslav Reznik - 4.5.1-1 - 4.5.1 +- use gpg2 in knewstuff (kde#249152) * Thu Aug 26 2010 Rex Dieter - 4.5.0-6 - use ca-certificates' ca-bundle.crt (#521902)