[packages/pinentry] - updated to 0.9.2 - updated info patch - added link patch (fixes build with --as-needed)

qboosh qboosh at pld-linux.org
Wed May 13 21:43:04 CEST 2015


commit 27b0f639df01af336215f89d4f186937c302a3b5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 13 21:44:38 2015 +0200

    - updated to 0.9.2
    - updated info patch
    - added link patch (fixes build with --as-needed)

 pinentry-info.patch | 10 +++++-----
 pinentry-link.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 pinentry.spec       |  7 +++++--
 3 files changed, 66 insertions(+), 7 deletions(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index 6d6538b..201d9c3 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -7,16 +7,17 @@
 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.1
+Version:	0.9.2
 Release:	1
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5:	d224d031130aedb44b05164cb04ed88b
+# Source0-md5:	f51d454f921111b5156a2291cbf70278
 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}
@@ -26,6 +27,7 @@ BuildRequires:	gettext-tools
 %{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.4.0}
 #BuildRequires:	libassuan-devel
 BuildRequires:	libcap-devel
+BuildRequires:	libsecret-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
@@ -74,6 +76,7 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %if %{with qt4}
 cd qt4
diff --git a/pinentry-info.patch b/pinentry-info.patch
index 4114d5d..195d446 100644
--- a/pinentry-info.patch
+++ b/pinentry-info.patch
@@ -1,14 +1,14 @@
---- pinentry-0.7.4/doc/pinentry.texi.orig	2007-11-28 23:57:55.000000000 +0100
-+++ pinentry-0.7.4/doc/pinentry.texi	2007-12-03 20:51:04.615772218 +0100
-@@ -60,9 +60,9 @@
+--- pinentry-0.9.2/doc/pinentry.texi.orig	2015-05-13 20:28:31.331690553 +0200
++++ pinentry-0.9.2/doc/pinentry.texi	2015-05-13 20:40:01.474994923 +0200
+@@ -54,9 +54,9 @@
  @c %**end of header
  
  @ifnottex
 - at dircategory GNU Utilities
 + at dircategory Miscellaneous:
  @direntry
--* pinentry: (pinentry).    Ask securely for a passphrase or PIN.
-+* pinentry: (pinentry).			Ask securely for a passphrase or PIN
+-* pinentry: (pinentry).    Securely ask for a passphrase or PIN.
++* pinentry: (pinentry).			Securely ask for a passphrase or PIN
  @end direntry
  This file documents the use and the internals of the @pinentry{}.
  
diff --git a/pinentry-link.patch b/pinentry-link.patch
new file mode 100644
index 0000000..f47f7c7
--- /dev/null
+++ b/pinentry-link.patch
@@ -0,0 +1,56 @@
+--- 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/27b0f639df01af336215f89d4f186937c302a3b5



More information about the pld-cvs-commit mailing list