commit baebdc9c0e9d14b583450ca4b23dd83c3c961534
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Sep 20 18:47:43 2014 +0200
- up to 0.8.4
...pinentry-window-created-in-the-background.patch | 28 ----------------------
pinentry-am.patch | 5 ++--
pinentry-doc.patch | 20 ++++++++++++++++
pinentry.spec | 7 +++---
4 files changed, 27 insertions(+), 33 deletions(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index 3ca3893..b42e148 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -9,16 +9,16 @@
Summary: Simple PIN or passphrase entry dialogs
Summary(pl.UTF-8): Proste kontrolki dialogowe do wpisywania PIN-ów lub
haseł
Name: pinentry
-Version: 0.8.3
+Version: 0.8.4
Release: 1
License: GPL v2+
Group: Applications
Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5: 2ae681cbca0d9fb774b2c90b11ebf56c
+# Source0-md5: e2b6f94471ba1e978f6e5bf6b275189b
Patch0: %{name}-system-assuan.patch
Patch1: %{name}-info.patch
Patch2: %{name}-am.patch
-Patch3:
0001-Fix-qt4-pinentry-window-created-in-the-background.patch
+Patch3: %{name}-doc.patch
URL: http://www.gnupg.org/
%{?with_qt4:BuildRequires: QtGui-devel}
BuildRequires: autoconf >= 2.57
@@ -104,6 +104,7 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł
dla Qt4.
%if %{with qt4}
cd qt4
%{_bindir}/moc-qt4 pinentrydialog.h -o pinentrydialog.moc
+%{_bindir}/moc-qt4 pinentryconfirm.h -o pinentryconfirm.moc
%{_bindir}/moc-qt4 qsecurelineedit.h -o qsecurelineedit.moc
cd ..
%endif
diff --git a/0001-Fix-qt4-pinentry-window-created-in-the-background.patch
b/0001-Fix-qt4-pinentry-window-created-in-the-background.patch
deleted file mode 100644
index 8f9faae..0000000
--- a/0001-Fix-qt4-pinentry-window-created-in-the-background.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <[email protected]>
-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
-
diff --git a/pinentry-am.patch b/pinentry-am.patch
index 369019a..adff678 100644
--- a/pinentry-am.patch
+++ b/pinentry-am.patch
@@ -1,11 +1,12 @@
--- pinentry-0.8.3/configure.ac.orig 2013-04-26 12:23:27.000000000 +0200
+++ pinentry-0.8.3/configure.ac 2013-05-07 21:00:47.685935015 +0200
-@@ -44,7 +44,7 @@
-
+@@ -45,7 +45,7 @@
AC_INIT([pinentry],[mym4_full_version], [http://bugs.gnupg.org])
+ AC_CONFIG_AUX_DIR([build-aux])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(pinentry/pinentry.h)
AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+
diff --git a/pinentry-doc.patch b/pinentry-doc.patch
new file mode 100644
index 0000000..b0761de
--- /dev/null
+++ b/pinentry-doc.patch
@@ -0,0 +1,20 @@
+--- pinentry-0.8.4/doc/gpl.texi.org 2014-09-20 18:45:55.983386523 +0200
++++ pinentry-0.8.4/doc/gpl.texi 2014-09-20 18:46:09.430404035 +0200
+@@ -12,7 +12,7 @@
+ of this license document, but changing it is not allowed.
+ @end display
+
+-@appendixsubsec Preamble
++@appendixsec Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General Public
+@@ -63,7 +63,7 @@
+ modification follow.
+
+ @iftex
+-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
MODIFICATION
++@appendixsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ @end iftex
+ @ifinfo
+ @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pinentry.git/commitdiff/baebdc9c0e9d14b583450ca4b23dd83c3c961534
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
