From 5fe1d3c7a8db63a71449f7c85c92fecd48dbb855 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mar 24 2011 17:08:50 +0000
Subject: Merge remote-tracking branch 'origin/master' into f14/master


Conflicts:
	kdeutils.spec

---

diff --git a/kdeutils-4.6.1-gpg2.patch b/kdeutils-4.6.1-gpg2.patch
new file mode 100644
index 0000000..2ea192c
--- /dev/null
+++ b/kdeutils-4.6.1-gpg2.patch
@@ -0,0 +1,24 @@
+diff -up kdeutils-4.6.1/kgpg/kgpg.kcfg.gnupg2 kdeutils-4.6.1/kgpg/kgpg.kcfg
+--- kdeutils-4.6.1/kgpg/kgpg.kcfg.gnupg2	2011-01-18 15:24:55.000000000 -0600
++++ kdeutils-4.6.1/kgpg/kgpg.kcfg	2011-03-24 11:27:15.186864517 -0500
+@@ -60,7 +60,7 @@
+         </entry>
+         <entry name="GpgBinaryPath" type="Path" key="gpg_bin_path">
+             <label>The path of the gpg binary used by KGpg.</label>
+-            <default>gpg</default>
++            <default>gpg2</default>
+         </entry>
+         <entry name="Groups" type="String">
+             <label>GPG groups</label>
+diff -up kdeutils-4.6.1/kgpg/kgpgoptions.cpp.gnupg2 kdeutils-4.6.1/kgpg/kgpgoptions.cpp
+--- kdeutils-4.6.1/kgpg/kgpgoptions.cpp.gnupg2	2011-03-24 11:36:02.627895937 -0500
++++ kdeutils-4.6.1/kgpg/kgpgoptions.cpp	2011-03-24 11:36:08.912361046 -0500
+@@ -154,7 +154,7 @@ void kgpgOptions::slotChangeHome()
+ 				// start GnuPG so that it will create a config file
+ 				QString gpgbin = m_page4->gpg_bin_path->text();
+ 				if (!QFile::exists(gpgbin))
+-					gpgbin = QLatin1String( "gpg" );
++					gpgbin = QLatin1String( "gpg2" );
+ 
+ 				KProcess p;
+ 				p << gpgbin << QLatin1String( "--homedir" ) << gpgHome << QLatin1String( "--no-tty" ) << QLatin1String( "--list-secret-keys" );
diff --git a/kdeutils.spec b/kdeutils.spec
index 10e763b..5ae6c3b 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Utilities
 
 Group:          Applications/System
@@ -16,10 +16,13 @@ URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# add support for automatic printer driver installation (Tim Waugh, #576660)
-Patch0:         kdeutils-4.4.1-printer-applet-InstallPrinterDrivers.patch
+## upstreamable patches
+# default to gpg2 in kgpg, todo: support gpg *or* gpg2
+Patch50: kdeutils-4.6.1-gpg2.patch
 
-## upstream patches, stable branch
+## upstream patches
+# added to trunk/4.7, add support for automatic printer driver installation (Tim Waugh, #576660)
+Patch100: kdeutils-4.4.1-printer-applet-InstallPrinterDrivers.patch
 
 Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
@@ -74,6 +77,10 @@ Group:   Applications/System
 Requires: %{name}-minimal-libs%{?_isa} = %{epoch}:%{version}-%{release}
 # when -minimal split occurred
 Conflicts: kdeutils < 6:4.5.0-2
+# for ark (#607126)
+Requires: p7zip-plugins
+# kgpg (can be either gnupg or gnupg2, we'll default to the latter)
+Requires: gnupg2
 %description minimal
 Minimal set of utilites for KDE 4.
 Includes:
@@ -113,8 +120,10 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q -n kdeutils-%{version}
+
+%patch50 -p1 -b .gpg2
 %if 0%{?fedora} > 12
-%patch0 -p1 -b .InstallPrinterDrivers
+%patch100 -p1 -b .InstallPrinterDrivers
 %endif
 
 
@@ -326,6 +335,10 @@ fi
 
 
 %changelog
+* Thu Mar 24 2011 Rex Dieter <rdieter@fedoraproject.org> 6:4.6.1-2
+- ark uses 7z, not 7za (#607126)
+- Wrong default configuration of Gnupg in Kgpg (#647876)
+
 * Mon Feb 28 2011 Rex Dieter <rdieter@fedoraproject.org> 6:4.6.1-1
 - 4.6.1