[packages/pinentry] - updated to 0.9.4 - added gnome3 dialog
qboosh
qboosh at pld-linux.org
Sat Jun 13 23:14:58 CEST 2015
commit 046a165e16e5408e391ebfded14d59d08198b976
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 13 23:16:17 2015 +0200
- updated to 0.9.4
- added gnome3 dialog
pinentry-activate.patch | 12 -----------
pinentry-link.patch | 56 -------------------------------------------------
pinentry.spec | 30 ++++++++++++++++++++------
3 files changed, 24 insertions(+), 74 deletions(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index 201d9c3..af94943 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -2,28 +2,29 @@
#
# Conditional build:
%bcond_without gtk2 # without GTK+ 2 dialog
+%bcond_without gnome3 # without GNOME 3 dialog
%bcond_without qt4 # without Qt4 dialog
#
Summary: Simple PIN or passphrase entry dialogs
Summary(pl.UTF-8): Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
Name: pinentry
-Version: 0.9.2
+Version: 0.9.4
Release: 1
License: GPL v2+
Group: Applications
Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5: f51d454f921111b5156a2291cbf70278
+# Source0-md5: 50dd255d23839079e15a02761f11d4c8
Patch0: %{name}-system-assuan.patch
Patch1: %{name}-info.patch
Patch2: %{name}-am.patch
-Patch3: %{name}-activate.patch
-Patch4: %{name}-link.patch
URL: http://www.gnupg.org/
%{?with_qt4:BuildRequires: QtCore-devel >= 4}
%{?with_qt4:BuildRequires: QtGui-devel >= 4}
BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.14
BuildRequires: gettext-tools
+%{?with_gnome3:BuildRequires: gcr-devel >= 3}
+%{?with_gnome3:BuildRequires: gcr-ui-devel >= 3}
%{?with_gtk2:BuildRequires: gtk+2-devel >= 2:2.4.0}
#BuildRequires: libassuan-devel
BuildRequires: libcap-devel
@@ -47,6 +48,18 @@ haseł, używające protokołu Assuan opisanego w projekcie aegypten;
więcej szczegółów pod adresem http://www.gnupg.org/aegypten/.
Podstawowy pakiet zawiera kontrolkę opartą na curses.
+%package gnome3
+Summary: Simple PIN or passphrase entry dialog for GNOME 3
+Summary(pl.UTF-8): Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GNOME 3
+Group: X11/Applications
+Requires: gtk+2 >= 2:2.4.0
+
+%description gnome3
+Simple PIN or passphrase entry dialog for GNOME 3.
+
+%description gnome3 -l pl.UTF-8
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GNOME 3.
+
%package gtk2
Summary: Simple PIN or passphrase entry dialog for GTK+ 2
Summary(pl.UTF-8): Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 2
@@ -75,8 +88,6 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4.
#patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%if %{with qt4}
cd qt4
@@ -98,6 +109,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
--enable-maintainer-mode \
--enable-fallback-curses \
--enable-pinentry-curses \
+ --enable-pinentry-gnome3%{!?with_gnome3:=no} \
--enable-pinentry-gtk2%{!?with_gtk2:=no} \
--enable-pinentry-qt4%{!?with_qt4:=no} \
--enable-pinentry-tty
@@ -148,6 +160,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/pinentry-tty
%{_infodir}/pinentry.info*
+%if %{with gnome3}
+%files gnome3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pinentry-gnome3
+%endif
+
%if %{with gtk2}
%files gtk2
%defattr(644,root,root,755)
diff --git a/pinentry-activate.patch b/pinentry-activate.patch
deleted file mode 100644
index c2fbed7..0000000
--- a/pinentry-activate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-; https://bugzilla.redhat.com/show_bug.cgi?id=589532
-; http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background
---- pinentry-0.8.4/qt4/pinentrydialog.cpp~ 2014-08-06 15:11:41.000000000 +0200
-+++ pinentry-0.8.4/qt4/pinentrydialog.cpp 2014-09-20 20:50:00.806724935 +0200
-@@ -76,7 +76,6 @@
- /* 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()) &&
diff --git a/pinentry-link.patch b/pinentry-link.patch
deleted file mode 100644
index f47f7c7..0000000
--- a/pinentry-link.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- pinentry-0.9.2/curses/Makefile.am.orig 2015-05-11 12:23:06.000000000 +0200
-+++ pinentry-0.9.2/curses/Makefile.am 2015-05-13 21:10:26.984918315 +0200
-@@ -22,9 +22,9 @@
- bin_PROGRAMS = pinentry-curses
-
- AM_CPPFLAGS = $(COMMON_CFLAGS) $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
--LDADD = $(COMMON_LIBS) \
-+LDADD = \
- ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
- ../assuan/libassuan.a ../secmem/libsecmem.a \
-- $(LIBCAP) $(LIBCURSES) $(LIBICONV)
-+ $(COMMON_LIBS) $(LIBCAP) $(LIBCURSES) $(LIBICONV)
-
- pinentry_curses_SOURCES = pinentry-curses.c
---- pinentry-0.9.2/tty/Makefile.am.orig 2015-05-11 12:23:06.000000000 +0200
-+++ pinentry-0.9.2/tty/Makefile.am 2015-05-13 21:17:33.518233748 +0200
-@@ -21,8 +21,8 @@
- bin_PROGRAMS = pinentry-tty
-
- AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)/pinentry
--LDADD = $(COMMON_LIBS) ../pinentry/libpinentry.a \
-+LDADD = ../pinentry/libpinentry.a \
- ../assuan/libassuan.a ../secmem/libsecmem.a \
-- $(LIBCAP) $(LIBICONV)
-+ $(COMMON_LIBS) $(LIBCAP) $(LIBICONV)
-
- pinentry_tty_SOURCES = pinentry-tty.c
---- pinentry-0.9.2/gtk+-2/Makefile.am.orig 2015-05-11 12:23:06.000000000 +0200
-+++ pinentry-0.9.2/gtk+-2/Makefile.am 2015-05-13 21:27:19.931542471 +0200
-@@ -31,9 +31,9 @@
-
- AM_CPPFLAGS = $(COMMON_CFLAGS) $(GTK2CFLAGS) $(ncurses_include) \
- -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
--LDADD = $(COMMON_LIBS) \
-+LDADD = \
- ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-- $(LIBCAP) $(GTK2LIBS) $(libcurses)
-+ $(COMMON_LIBS) $(LIBCAP) $(GTK2LIBS) $(libcurses)
-
- pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
- gtksecentry.c gtksecentry.h gseal-gtk-compat.h
---- pinentry-0.9.2/qt4/Makefile.am.orig 2015-05-11 12:23:06.000000000 +0200
-+++ pinentry-0.9.2/qt4/Makefile.am 2015-05-13 21:35:32.554855131 +0200
-@@ -38,10 +38,10 @@
- -I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
- $(ncurses_include) -I$(top_srcdir)/pinentry
- AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
--pinentry_qt4_LDADD = $(COMMON_LIBS) \
-+pinentry_qt4_LDADD = \
- $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
- ../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
-- $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
-+ $(top_builddir)/secmem/libsecmem.a $(COMMON_LIBS) $(LIBCAP)
-
- BUILT_SOURCES = \
- pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pinentry.git/commitdiff/046a165e16e5408e391ebfded14d59d08198b976
More information about the pld-cvs-commit
mailing list