Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pinentry.git#5c001e46417c0a7af7cf3ea8534987ca48a52339
This commit is contained in:
DistroBaker 2021-01-06 16:12:49 +00:00
parent eab3e01447
commit 69b3a66df6
2 changed files with 9 additions and 3 deletions

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/sh
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Fedora Project # Copyright (c) 2009 Fedora Project
@ -71,8 +71,12 @@ then
elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ] elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-qt" export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# pinentry-curses is installed by default # use pinentry-curses for interactive mode
else elif [ -t 0 -a -t 1 ];
then
export PINENTRY_BINARY="/usr/bin/pinentry-curses" export PINENTRY_BINARY="/usr/bin/pinentry-curses"
# fallback to pinentry-tty in no TTY is provided
else
export PINENTRY_BINARY="/usr/bin/pinentry-tty"
fi fi
exec $PINENTRY_BINARY "$@" exec $PINENTRY_BINARY "$@"

View File

@ -88,6 +88,7 @@ This package contains the emacs based version of the PIN entry dialog.
--enable-pinentry-gtk2 \ --enable-pinentry-gtk2 \
--enable-pinentry-qt5 \ --enable-pinentry-qt5 \
--enable-pinentry-emacs \ --enable-pinentry-emacs \
--enable-pinentry-tty \
--enable-libsecret --enable-libsecret
%make_build %make_build
@ -109,6 +110,7 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
%license COPYING %license COPYING
%doc AUTHORS ChangeLog NEWS README THANKS TODO %doc AUTHORS ChangeLog NEWS README THANKS TODO
%{_bindir}/pinentry-curses %{_bindir}/pinentry-curses
%{_bindir}/pinentry-tty
%{_bindir}/pinentry %{_bindir}/pinentry
%{_infodir}/pinentry.info* %{_infodir}/pinentry.info*