From 4cadde3bbf837160a329a93995f1563065c47d93 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sep 10 2012 12:35:12 +0000 Subject: Merge branch 'master' into f17 Conflicts: .gitignore kgpg.spec sources --- diff --git a/.gitignore b/.gitignore index 0c458b3..90a83f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/kgpg-4.8.3.tar.xz -/kgpg-4.8.4.tar.xz /kgpg-4.8.5.tar.xz +/kgpg-4.9.1.tar.xz diff --git a/kdeutils-4.7.1-gpg2.patch b/kdeutils-4.7.1-gpg2.patch deleted file mode 100644 index 9ac19d8..0000000 --- a/kdeutils-4.7.1-gpg2.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up kdeutils-4.7.1/kgpg/kgpgoptions.cpp.gpg2 kdeutils-4.7.1/kgpg/kgpgoptions.cpp ---- kdeutils-4.7.1/kgpg/kgpgoptions.cpp.gpg2 2011-09-01 16:22:36.000000000 -0500 -+++ kdeutils-4.7.1/kgpg/kgpgoptions.cpp 2011-09-28 13:50:06.679879225 -0500 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "images.h" - #include "kgpgsettings.h" -@@ -136,6 +137,16 @@ kgpgOptions::~kgpgOptions() - delete m_page7; - } - -+static QString gpgExecutable() -+{ -+ QString gpgExe = KStandardDirs::findExe( "gpg" ); -+ if ( gpgExe.isEmpty() ) -+ gpgExe = KStandardDirs::findExe( "gpg2" ); -+ if ( gpgExe.isEmpty() ) -+ return QLatin1String( "gpg" ); -+ return gpgExe; -+} -+ - void kgpgOptions::slotChangeHome() - { - QString gpgHome = KFileDialog::getExistingDirectory(m_page4->gpg_home_path->text(), this, i18n("New GnuPG Home Location")); -@@ -158,7 +169,7 @@ void kgpgOptions::slotChangeHome() - // start GnuPG so that it will create a config file - QString gpgbin = m_page4->kcfg_GpgBinaryPath->text(); - if (!QFile::exists(gpgbin)) -- gpgbin = QLatin1String( "gpg" ); -+ gpgbin = gpgExecutable(); - - KProcess p; - p << gpgbin << QLatin1String( "--homedir" ) << gpgHome << QLatin1String( "--no-tty" ) << QLatin1String( "--list-secret-keys" ); diff --git a/kgpg-4.8.80-gpg2.patch b/kgpg-4.8.80-gpg2.patch new file mode 100644 index 0000000..01e2064 --- /dev/null +++ b/kgpg-4.8.80-gpg2.patch @@ -0,0 +1,29 @@ +diff -up kgpg-4.8.80/kgpgoptions.cpp.gpg2 kgpg-4.8.80/kgpgoptions.cpp +--- kgpg-4.8.80/kgpgoptions.cpp.gpg2 2012-05-23 02:38:31.000000000 +0200 ++++ kgpg-4.8.80/kgpgoptions.cpp 2012-06-03 11:58:35.151732768 +0200 +@@ -132,6 +132,16 @@ kgpgOptions::~kgpgOptions() + delete m_page7; + } + ++static QString gpgExecutable() ++{ ++ QString gpgExe = KStandardDirs::findExe( "gpg" ); ++ if ( gpgExe.isEmpty() ) ++ gpgExe = KStandardDirs::findExe( "gpg2" ); ++ if ( gpgExe.isEmpty() ) ++ return QLatin1String( "gpg" ); ++ return gpgExe; ++} ++ + void kgpgOptions::slotChangeHome() + { + QString gpgHome = KFileDialog::getExistingDirectory(m_page4->gpg_home_path->text(), this, i18n("New GnuPG Home Location")); +@@ -154,7 +164,7 @@ void kgpgOptions::slotChangeHome() + // start GnuPG so that it will create a config file + QString gpgbin = m_page4->kcfg_GpgBinaryPath->text(); + if (!QFile::exists(gpgbin)) +- gpgbin = QLatin1String( "gpg" ); ++ gpgbin = gpgExecutable(); + + KProcess p; + p << gpgbin << QLatin1String( "--homedir" ) << gpgHome << QLatin1String( "--no-tty" ) << QLatin1String( "--list-secret-keys" ); diff --git a/kgpg.spec b/kgpg.spec index f7ce214..e8a2309 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -1,6 +1,6 @@ Name: kgpg Summary: Manage GPG encryption keys -Version: 4.8.5 +Version: 4.9.1 Release: 1%{?dist} License: GPLv2+ @@ -16,7 +16,7 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar ## upstreamable patches # add support for gpg2 to kgpg -Patch50: kdeutils-4.7.1-gpg2.patch +Patch50: kgpg-4.8.80-gpg2.patch BuildRequires: desktop-file-utils BuildRequires: kdelibs4-devel >= %{version} @@ -28,7 +28,7 @@ Conflicts: kdeutils-common < 6:4.7.80 Obsoletes: kdeutils-kgpg < 6:4.7.80 Provides: kdeutils-kgpg = 6:%{version}-%{release} -%{?_kde4_version:Requires: kdepimlibs%{?_isa} >= %{_kde4_version}} +%{?_kde4:Requires: kdepimlibs%{?_isa} >= %{_kde4_version}} # kgpg (can be either gnupg or gnupg2, we'll default to the latter) Requires: gnupg2 @@ -39,7 +39,7 @@ KGpg is a simple interface for GnuPG, a powerful encryption utility. %prep %setup -q -n %{name}-%{version} -%patch50 -p2 -b .gpg2 +%patch50 -p1 -b .gpg2 %build @@ -91,11 +91,26 @@ fi %changelog -* Thu Aug 02 2012 Rex Dieter - 4.8.5-1 -- 4.8.5 +* Mon Sep 03 2012 Than Ngo - 4.9.1-1 +- 4.9.1 -* Mon Jun 04 2012 Than Ngo - 4.8.4-1 -- 4.8.4 +* Thu Jul 26 2012 Lukas Tinkl - 4.9.0-1 +- 4.9.0 + +* Thu Jul 19 2012 Fedora Release Engineering - 4.8.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jul 12 2012 Rex Dieter - 4.8.97-1 +- 4.8.97 + +* Thu Jun 28 2012 Rex Dieter - 4.8.95-1 +- 4.8.95 + +* Sun Jun 10 2012 Rex Dieter - 4.8.90-1 +- 4.8.90 + +* Sun Jun 03 2012 Jaroslav Reznik - 4.8.80-1 +- 4.8.80 * Mon Apr 30 2012 Jaroslav Reznik - 4.8.3-1 - 4.8.3 diff --git a/sources b/sources index d191e77..39997c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -025139b29885c8098640bd42e7468bca kgpg-4.8.5.tar.xz +07dc90d81fd5783afbffc509c9a6c539 kgpg-4.9.1.tar.xz