- updated to 0.9.5

- dropped obsolete system-assuan patch

diff --git a/pinentry-system-assuan.patch b/pinentry-system-assuan.patch
deleted file mode 100644 (file)
index bd39b38..0000000
--- a/pinentry-system-assuan.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- pinentry-0.6.9/pinentry/Makefile.am.orig   Thu May  9 14:38:06 2002
-+++ pinentry-0.6.9/pinentry/Makefile.am        Thu Aug 21 10:50:04 2003
-@@ -27,7 +27,7 @@
- 
- noinst_LIBRARIES = libpinentry.a $(pinentry_curses)
- 
--AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem
-+AM_CPPFLAGS = -I$(top_srcdir)/secmem
- 
- libpinentry_a_SOURCES = pinentry.h pinentry.c
- libpinentry_curses_a_SOURCES = pinentry-curses.h pinentry-curses.c
---- pinentry-0.6.9/curses/Makefile.am.orig     Thu May  9 14:38:06 2002
-+++ pinentry-0.6.9/curses/Makefile.am  Thu Aug 21 10:49:29 2003
-@@ -23,7 +23,7 @@
- 
- AM_CPPFLAGS = $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
- LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
--      ../assuan/libassuan.a ../secmem/libsecmem.a \
-+      -lassuan1 ../secmem/libsecmem.a \
-       $(LIBCAP) $(LIBCURSES) $(LIBICONV)
- 
- pinentry_curses_SOURCES = pinentry-curses.c
---- pinentry-0.6.9/gtk/Makefile.am.orig        Thu May  9 14:38:06 2002
-+++ pinentry-0.6.9/gtk/Makefile.am     Thu Aug 21 10:49:43 2003
-@@ -31,7 +31,7 @@
- 
- AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(ncurses_include) \
-       -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
--LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+LDADD = ../pinentry/libpinentry.a -lassuan1 ../secmem/libsecmem.a \
-       $(LIBCAP) $(GTK_LIBS) $(libcurses)
- 
- pinentry_gtk_SOURCES = pinentry-gtk.c \
---- pinentry-0.7.2/qt/Makefile.am.orig 2004-09-21 20:58:02.000000000 +0200
-+++ pinentry-0.7.2/qt/Makefile.am      2005-02-28 08:18:37.063461672 +0100
-@@ -32,11 +32,11 @@
- endif
- 
- 
--AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include) \
-+AM_CPPFLAGS = -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include) \
-       -I$(top_srcdir)/pinentry
- AM_CXXFLAGS = $(QT_CXXFLAGS)
- pinentry_qt_LDADD = $(QT_LIBS) $(libcurses) ../pinentry/libpinentry.a \
--      $(top_builddir)/assuan/libassuan.a \
-+      -lassuan1 \
-       $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
- pinentry_qt_LDFLAGS = $(QT_LDFLAGS) $(QT_RPATH)
- 
---- pinentry-0.7.2/Makefile.am.orig    2004-12-22 11:48:43.000000000 +0100
-+++ pinentry-0.7.2/Makefile.am 2005-02-28 08:18:55.224700744 +0100
-@@ -59,7 +59,7 @@
- pinentry_w32 = 
- endif
- 
--SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
-+SUBDIRS = secmem pinentry ${pinentry_curses} \
-       ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \
-       ${pinentry_w32} doc
- 
---- pinentry-0.7.0/pinentry/pinentry.c.orig    2003-12-22 19:28:07.000000000 +0100
-+++ pinentry-0.7.0/pinentry/pinentry.c 2003-12-24 03:29:35.018915904 +0100
-@@ -37,6 +37,7 @@
- #include "secmem-util.h"
- #include "pinentry.h"
- 
-+#define ASSUAN_Locale_Problem 127
- 
- /* Keep the name of our program here. */
- static char this_pgmname[50]; 
-@@ -649,8 +650,6 @@
-   for (i = j = 0; table[i].name; i++)
-     {
-       rc = assuan_register_command (ctx,
--                                    table[i].cmd_id ? table[i].cmd_id
--                                                   : (ASSUAN_CMD_USER + j++),
-                                     table[i].name, table[i].handler);
-       if (rc)
-         return rc;
---- pinentry-0.7.2/gtk+-2/Makefile.am.orig     2005-01-27 09:10:22.000000000 +0100
-+++ pinentry-0.7.2/gtk+-2/Makefile.am  2005-02-28 08:19:40.426828976 +0100
-@@ -31,7 +31,7 @@
- 
- AM_CPPFLAGS = $(GTK2CFLAGS) $(ncurses_include) \
-       -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
--LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+LDADD = ../pinentry/libpinentry.a -lassuan1 ../secmem/libsecmem.a \
-       $(LIBCAP) $(GTK2LIBS) $(libcurses)
- 
- pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
---- p/qt4/Makefile.am~ 2009-04-03 16:44:01.000000000 +0200
-+++ p/qt4/Makefile.am  2009-07-26 00:06:00.686756152 +0200
-@@ -31,11 +31,11 @@
- endif
- 
- 
--AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/secmem \
-       $(ncurses_include) -I$(top_srcdir)/pinentry
- AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
- pinentry_qt4_LDADD = $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
--      ../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
-+      ../pinentry/libpinentry.a -lassuan1 \
-       $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
- 
- pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \

diff --git a/pinentry.spec b/pinentry.spec
index af94943184f7e4e302ffbb3c77d0a1c4cd90ef99..3b2029444f58bbe6eec0a86de72f99ac5b6777f9 100644 (file)
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -1,4 +1,3 @@
-# TODO: use system libassuan 2 instead of included libassuan 1
 #
 # Conditional build:
 %bcond_without gtk2    # without GTK+ 2 dialog
@@ -8,15 +7,14 @@
 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.4
+Version:       0.9.5
 Release:       1
 License:       GPL v2+
 Group:         Applications
 Source0:       ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5: 50dd255d23839079e15a02761f11d4c8
-Patch0:                %{name}-system-assuan.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-am.patch
+# Source0-md5: 55439c4436b59573a29e144916ee5b61
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-am.patch
 URL:           http://www.gnupg.org/
 %{?with_qt4:BuildRequires:     QtCore-devel >= 4}
 %{?with_qt4:BuildRequires:     QtGui-devel >= 4}
@@ -26,14 +24,17 @@ 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: libassuan-devel >= 1:2.1.0
 BuildRequires: libcap-devel
+BuildRequires: libgpg-error-devel >= 1.16
 BuildRequires: libsecret-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
 %{?with_qt4:BuildRequires:     qt4-build}
 BuildRequires: texinfo
+Requires:      libassuan >= 1:2.1.0
+Requires:      libgpg-error >= 1.16
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,11 +49,27 @@ 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 emacs
+Summary:       Simple PIN or passphrase entry dialog for Emacs
+Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Emacsa
+Group:         Applications
+Requires:      emacs
+Requires:      libassuan >= 1:2.1.0
+Requires:      libgpg-error >= 1.16
+
+%description emacs
+Simple PIN or passphrase entry dialog for Emacs.
+
+%description emacs -l pl.UTF-8
+Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Emacsa.
+
 %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
+Requires:      libassuan >= 1:2.1.0
+Requires:      libgpg-error >= 1.16
 
 %description gnome3
 Simple PIN or passphrase entry dialog for GNOME 3.
@@ -65,6 +82,8 @@ 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
 Group:         X11/Applications
 Requires:      gtk+2 >= 2:2.4.0
+Requires:      libassuan >= 1:2.1.0
+Requires:      libgpg-error >= 1.16
 
 %description gtk2
 Simple PIN or passphrase entry dialog for GTK+ 2.
@@ -76,6 +95,8 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla GTK+ 2.
 Summary:       Simple PIN or passphrase entry dialog for Qt4
 Summary(pl.UTF-8):     Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4
 Group:         X11/Applications
+Requires:      libassuan >= 1:2.1.0
+Requires:      libgpg-error >= 1.16
 
 %description qt4
 Simple PIN or passphrase entry dialog for Qt4.
@@ -85,9 +106,8 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4.
 
 %prep
 %setup -q
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if %{with qt4}
 cd qt4
@@ -160,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pinentry-tty
 %{_infodir}/pinentry.info*
 
+%files emacs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pinentry-emacs
+
 %if %{with gnome3}
 %files gnome3
 %defattr(644,root,root,755)