[kdeutils] 4.6.80

[Jaroslav Reznik]

commit 2b98c842156542542cf6fc29168567dabf300c39
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Jun 14 10:28:02 2011 +0200

    4.6.80

 .gitignore                                         |    1 +
 ...-4.6.1-gpg2.patch => kdeutils-4.6.80-gpg2.patch |   16 ++++++++--------
 kdeutils.spec                                      |    7 +++++--
 sources                                            |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 913c1dc..43ab6fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdeutils-4.6.1.tar.bz2
 /kdeutils-4.6.2.tar.bz2
 /kdeutils-4.6.3.tar.bz2
+/kdeutils-4.6.80.tar.bz2
diff --git a/kdeutils-4.6.1-gpg2.patch b/kdeutils-4.6.80-gpg2.patch
similarity index 54%
rename from kdeutils-4.6.1-gpg2.patch
rename to kdeutils-4.6.80-gpg2.patch
index 2ea192c..3d208aa 100644
--- a/kdeutils-4.6.1-gpg2.patch
+++ b/kdeutils-4.6.80-gpg2.patch
@@ -1,6 +1,6 @@
-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
+diff -up kdeutils-4.6.80/kgpg/kgpg.kcfg.gpg2 kdeutils-4.6.80/kgpg/kgpg.kcfg
+--- kdeutils-4.6.80/kgpg/kgpg.kcfg.gpg2	2010-05-16 22:05:42.000000000 +0200
++++ kdeutils-4.6.80/kgpg/kgpg.kcfg	2011-06-14 10:24:46.878450069 +0200
 @@ -60,7 +60,7 @@
          </entry>
          <entry name="GpgBinaryPath" type="Path" key="gpg_bin_path">
@@ -10,12 +10,12 @@ diff -up kdeutils-4.6.1/kgpg/kgpg.kcfg.gnupg2 kdeutils-4.6.1/kgpg/kgpg.kcfg
          </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()
+diff -up kdeutils-4.6.80/kgpg/kgpgoptions.cpp.gpg2 kdeutils-4.6.80/kgpg/kgpgoptions.cpp
+--- kdeutils-4.6.80/kgpg/kgpgoptions.cpp.gpg2	2011-05-20 22:16:54.000000000 +0200
++++ kdeutils-4.6.80/kgpg/kgpgoptions.cpp	2011-06-14 10:25:45.515218869 +0200
+@@ -156,7 +156,7 @@ void kgpgOptions::slotChangeHome()
  				// start GnuPG so that it will create a config file
- 				QString gpgbin = m_page4->gpg_bin_path->text();
+ 				QString gpgbin = m_page4->kcfg_GpgBinaryPath->text();
  				if (!QFile::exists(gpgbin))
 -					gpgbin = QLatin1String( "gpg" );
 +					gpgbin = QLatin1String( "gpg2" );
diff --git a/kdeutils.spec b/kdeutils.spec
index b48a223..812ec17 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -5,7 +5,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.6.3
+Version:        4.6.80
 Release:        1%{?dist}
 Summary:        KDE Utilities
 
@@ -18,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 # default to gpg2 in kgpg, todo: support gpg *or* gpg2
-Patch50: kdeutils-4.6.1-gpg2.patch
+Patch50: kdeutils-4.6.80-gpg2.patch
 
 ## upstream patches
 
@@ -334,6 +334,9 @@ fi
 
 
 %changelog
+* Tue Jun 14 2011 Jaroslav Reznik <jreznik at redhat.com> - 6:4.6.80-1
+- 4.6.80 (beta1)
+
 * Fri Apr 29 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.3-1
 - 4.6.3
 
diff --git a/sources b/sources
index a56b99c..1851e24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d2911c29300d84db10948d7c196aaac  kdeutils-4.6.3.tar.bz2
+d56c5522df3495871211fb2b4f89f4b7  kdeutils-4.6.80.tar.bz2