Rebase to latest upstream 0.9.1 version

.gitignore

@@ -6,3 +6,5 @@ pinentry-0.8.0.tar.gz.sig
 /pinentry-0.8.3.tar.bz2.sig
 /pinentry-0.9.0.tar.bz2
 /pinentry-0.9.0.tar.bz2.sig
+/pinentry-0.9.1.tar.bz2
+/pinentry-0.9.1.tar.bz2.sig

0001-Provide-proper-include-paths-in-.moc-files.patch

@@ -1,53 +0,0 @@
-From 47bf4d3137a55f258954fadd0d47df2091605878 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Wed, 12 Nov 2014 20:39:05 +0100
-Subject: [PATCH] Provide proper include paths in .moc files
-
----
- qt4/pinentryconfirm.moc | 2 +-
- qt4/pinentrydialog.moc  | 2 +-
- qt4/qsecurelineedit.moc | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/qt4/pinentryconfirm.moc b/qt4/pinentryconfirm.moc
-index 516a716..c8a3899 100644
---- a/qt4/pinentryconfirm.moc
-+++ b/qt4/pinentryconfirm.moc
-@@ -6,7 +6,7 @@
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
- 
--#include "../../../s/pinentry/qt4/pinentryconfirm.h"
-+#include "pinentryconfirm.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'pinentryconfirm.h' doesn't include <QObject>."
- #elif Q_MOC_OUTPUT_REVISION != 63
-diff --git a/qt4/pinentrydialog.moc b/qt4/pinentrydialog.moc
-index 1dedd83..86bcf47 100644
---- a/qt4/pinentrydialog.moc
-+++ b/qt4/pinentrydialog.moc
-@@ -6,7 +6,7 @@
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
- 
--#include "../../../s/pinentry/qt4/pinentrydialog.h"
-+#include "pinentrydialog.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'pinentrydialog.h' doesn't include <QObject>."
- #elif Q_MOC_OUTPUT_REVISION != 63
-diff --git a/qt4/qsecurelineedit.moc b/qt4/qsecurelineedit.moc
-index 0685ec6..2f973d6 100644
---- a/qt4/qsecurelineedit.moc
-+++ b/qt4/qsecurelineedit.moc
-@@ -6,7 +6,7 @@
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
- 
--#include "../../../s/pinentry/qt4/qsecurelineedit.h"
-+#include "qsecurelineedit.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'qsecurelineedit.h' doesn't include <QObject>."
- #elif Q_MOC_OUTPUT_REVISION != 63
--- 
-1.9.3
-

pinentry.spec

@@ -1,7 +1,7 @@
 
 Name:    pinentry
-Version: 0.9.0
+Version: 0.9.1
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 # qt & qt4 subpackage have different license, see subpackage definitions
@@ -13,8 +13,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
 # borrowed from opensuse
 Source10: pinentry-wrapper
 
-Patch1: 0001-Provide-proper-include-paths-in-.moc-files.patch
+Patch1: 0001-Fix-qt4-pinentry-window-created-in-the-background.patch
-Patch2: 0002-Fix-qt4-pinentry-window-created-in-the-background.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
@@ -64,7 +63,6 @@ This package contains the Qt4 GUI based version of the PIN entry dialog.
 %setup -q
 
 %patch1 -p1
-%patch2 -p1
 
 %build
 
@@ -130,6 +128,10 @@ fi
 
 
 %changelog
+* Wed Mar 25 2015 Boris Ranto <branto@redhat.com> - 0.9.1-1
+- Rebase to latest upstream version
+- There are no longer any moc files so there is no need to patch them
+
 * Fri Mar 13 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.9.0-3
 - fix FTBFS on f23/gcc5
 - drop deprecated configure flags

sources

@@ -1,2 +1,2 @@
-40a05856cb3accf6679987b7899b0f5a  pinentry-0.9.0.tar.bz2
+d224d031130aedb44b05164cb04ed88b  pinentry-0.9.1.tar.bz2
-3798622c73088ed8affe64c01e5f22ec  pinentry-0.9.0.tar.bz2.sig
+41d17ba2609df811d5a8c5f0fc607df7  pinentry-0.9.1.tar.bz2.sig