Rebase to latest upstream version

.gitignore

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

0001-Fix-qt4-pinentry-window-created-in-the-background.patch

@@ -1,28 +0,0 @@
-From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 1 Feb 2011 14:42:27 +0100
-Subject: [PATCH] Fix qt4 pinentry window created in the background
-
-This is probably just a workaround. Proper fix is being investigated.
-See:
-https://bugzilla.redhat.com/show_bug.cgi?id=589532
-http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background
----
- qt4/pinentrydialog.cpp |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
-index 541baf4..d634eb6 100644
---- a/qt4/pinentrydialog.cpp
-+++ b/qt4/pinentrydialog.cpp
-@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w )
-     SetForegroundWindow( w->winId() );
- #endif
-     w->raise();
--    w->activateWindow();
- }
- 
- QPixmap icon( QStyle::StandardPixmap which )
--- 
-1.7.3.5
-

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

@@ -0,0 +1,53 @@
+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
+

0002-Fix-qt4-pinentry-window-created-in-the-background.patch

@@ -0,0 +1,28 @@
+From 00df8f314af7892fc7d5b20c80cc34f78b16a69c Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Wed, 12 Nov 2014 20:48:28 +0100
+Subject: [PATCH 2/2] Fix qt4 pinentry window created in the background
+
+This is probably just a workaround. Proper fix is being investigated.
+See:
+https://bugzilla.redhat.com/show_bug.cgi?id=589532
+http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdia
+---
+ qt4/pinentrydialog.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
+index 3a6dacc..1b71c80 100644
+--- a/qt4/pinentrydialog.cpp
++++ b/qt4/pinentrydialog.cpp
+@@ -76,7 +76,6 @@ void raiseWindow( QWidget* w )
+     /* Maybe Qt will become agressive enough one day that
+      * this is enough on windows too*/
+     w->raise();
+-    w->activateWindow();
+ #ifdef Q_WS_WIN
+     /* In the meantime we do our own attention grabbing */
+     if (!SetForegroundWindow (w->winId()) &&
+-- 
+1.9.3
+

pinentry.spec

@@ -1,7 +1,7 @@
 
 Name:    pinentry
-Version: 0.8.3
-Release: 7%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 # qt & qt4 subpackage have different license, see subpackage definitions
@@ -13,8 +13,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
 # borrowed from opensuse
 Source10: pinentry-wrapper
 
-## Patches not yet in SVN
-Patch53: 0001-Fix-qt4-pinentry-window-created-in-the-background.patch
+Patch1: 0001-Provide-proper-include-paths-in-.moc-files.patch
+Patch2: 0002-Fix-qt4-pinentry-window-created-in-the-background.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
@@ -63,10 +63,13 @@ This package contains the Qt4 GUI based version of the PIN entry dialog.
 %prep
 %setup -q
 
-%patch53 -p1 -b .rhbug_589532
-
+%patch1 -p1
+%patch2 -p1
 
 %build
+# Renew the configure/make scripts first
+./autogen.sh
+
 %configure \
   --disable-rpath \
   --disable-dependency-tracking \
@@ -126,6 +129,9 @@ fi
 
 
 %changelog
+* Wed Nov 12 2014 Boris Ranto <branto@redhat.com> - 0.9.0-1
+- Rebase to latest upstream version
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-2ae681cbca0d9fb774b2c90b11ebf56c  pinentry-0.8.3.tar.bz2
-ceb97a29e3db6a44f83102fd610f8af8  pinentry-0.8.3.tar.bz2.sig
+40a05856cb3accf6679987b7899b0f5a  pinentry-0.9.0.tar.bz2
+3798622c73088ed8affe64c01e5f22ec  pinentry-0.9.0.tar.bz2.sig