Rebase to latest upstream version

- Removing qt4 pinentry patch -- got merged upstream
- New package pinentry-emacs that hosts pinentry-emacs
- New dependencies on libassuan and libgpg-error (de-bundling)

.gitignore

@@ -10,3 +10,5 @@ pinentry-0.8.0.tar.gz.sig
 /pinentry-0.9.1.tar.bz2.sig
 /pinentry-0.9.2.tar.bz2
 /pinentry-0.9.2.tar.bz2.sig
+/pinentry-0.9.5.tar.bz2
+/pinentry-0.9.5.tar.bz2.sig

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

@@ -1,28 +0,0 @@
-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.9.2
+Version: 0.9.5
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 # qt & qt4 subpackage have different license, see subpackage definitions
@@ -13,12 +13,12 @@ Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
 # borrowed from opensuse
 Source10: pinentry-wrapper
 
-Patch1: 0001-Fix-qt4-pinentry-window-created-in-the-background.patch
-
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: qt4-devel
+BuildRequires: libgpg-error-devel
+BuildRequires: libassuan-devel
 
 Requires(pre): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
@@ -58,12 +58,18 @@ utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
 This package contains the Qt4 GUI based version of the PIN entry dialog.
 
+%package emacs
+Summary: Passphrase/PIN entry dialog based on emacs
+Requires: %{name} = %{version}-%{release}
+%description emacs
+Pinentry is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project; see
+http://www.gnupg.org/aegypten/ for details.
+This package contains the emacs based version of the PIN entry dialog.
 
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
 
 %if 0%{?fedora} > 22
@@ -99,6 +105,7 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
 %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
 %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
 %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-emacs ||:
 
 %post
 if [ -f %{_infodir}/pinentry.info* ]; then
@@ -126,8 +133,16 @@ fi
 %{_bindir}/pinentry-qt
 %{_bindir}/pinentry-qt4
 
+%files emacs
+%{_bindir}/pinentry-emacs
 
 %changelog
+* Thu Jul 02 2015 Boris Ranto <branto@redhat.com> - 0.9.5-1
+- Rebase to latest upstream version
+- Removing qt4 pinentry patch -- got merged upstream
+- New package pinentry-emacs that hosts pinentry-emacs
+- New dependencies on libassuan and libgpg-error (de-bundling)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-f51d454f921111b5156a2291cbf70278  pinentry-0.9.2.tar.bz2
+55439c4436b59573a29e144916ee5b61  pinentry-0.9.5.tar.bz2
-1beb374a47d0e0fd078cb8afa512439c  pinentry-0.9.2.tar.bz2.sig
+863139929ce5eeebe98d5c433bc82577  pinentry-0.9.5.tar.bz2.sig