[kgpg] 4.8.80

Jaroslav Reznik jreznik at fedoraproject.org
Sun Jun 3 19:02:16 UTC 2012


commit ed2743877f27ce3e1f0ba9e9f3461b4d72f9b482
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Sun Jun 3 12:02:21 2012 +0200

    4.8.80

 .gitignore                                         |    1 +
 ...tils-4.7.1-gpg2.patch => kgpg-4.8.80-gpg2.patch |   18 +++++-------------
 kgpg.spec                                          |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27d4668..4dc24bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kgpg-4.8.3.tar.xz
+/kgpg-4.8.80.tar.xz
diff --git a/kdeutils-4.7.1-gpg2.patch b/kgpg-4.8.80-gpg2.patch
similarity index 61%
rename from kdeutils-4.7.1-gpg2.patch
rename to kgpg-4.8.80-gpg2.patch
index 9ac19d8..01e2064 100644
--- a/kdeutils-4.7.1-gpg2.patch
+++ b/kgpg-4.8.80-gpg2.patch
@@ -1,15 +1,7 @@
-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 <KProcess>
- #include <kdefakes.h>
- #include <KFontChooser>
-+#include <kstandarddirs.h>
- 
- #include "images.h"
- #include "kgpgsettings.h"
-@@ -136,6 +137,16 @@ kgpgOptions::~kgpgOptions()
+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;
  }
  
@@ -26,7 +18,7 @@ diff -up kdeutils-4.7.1/kgpg/kgpgoptions.cpp.gpg2 kdeutils-4.7.1/kgpg/kgpgoption
  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()
+@@ -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))
diff --git a/kgpg.spec b/kgpg.spec
index 5c56b87..557100c 100644
--- a/kgpg.spec
+++ b/kgpg.spec
@@ -1,7 +1,7 @@
 
 Name:    kgpg
 Summary: Manage GPG encryption keys 
-Version: 4.8.3
+Version: 4.8.80
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -17,7 +17,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}
@@ -40,7 +40,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
@@ -92,6 +92,9 @@ fi
 
 
 %changelog
+* Sun Jun 03 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.80-1
+- 4.8.80
+
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.3-1
 - 4.8.3
 
diff --git a/sources b/sources
index 844da26..e49f69f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac97a81cfb679b5f496b380655d74805  kgpg-4.8.3.tar.xz
+e67f497686cecb9d6aaa07849ef690dd  kgpg-4.8.80.tar.xz


More information about the scm-commits mailing list