From 38bb0af74f94b0fdc326c46ecf90f576a69f7cec Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Jan 2018 09:10:30 -0600 Subject: [PATCH] 1.1.0 (#1397378) drop some old code/hacks/workarounds -qt: use Qt5 --- .gitignore | 2 ++ pinentry-wrapper | 10 +--------- pinentry.spec | 43 ++++++++++++++++--------------------------- sources | 4 ++-- 4 files changed, 21 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index d55dfef..7d05f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ pinentry-0.8.0.tar.gz.sig /pinentry-0.9.6.tar.bz2.sig /pinentry-0.9.7.tar.bz2 /pinentry-0.9.7.tar.bz2.sig +/pinentry-1.1.0.tar.bz2 +/pinentry-1.1.0.tar.bz2.sig diff --git a/pinentry-wrapper b/pinentry-wrapper index 3bb0fd3..2ea4677 100755 --- a/pinentry-wrapper +++ b/pinentry-wrapper @@ -14,7 +14,7 @@ # Pavol Rusnak 2009 # Boris Ranto 2014 # -# use proper binary (pinentry-qt4, pinentry-qt, pinentry-gtk-2 or pinentry-curses) +# use proper binary (pinentry-qt, pinentry-gnome, pinentry-gtk-2 or pinentry-curses) kde_running= arg= @@ -55,10 +55,6 @@ fi if [ -n "$PINENTRY_BINARY" ]; then export PINENTRY_BINARY="$PINENTRY_BINARY" -# if KDE is detected and pinentry-qt4 exists, use pinentry-qt4 -elif [ -n "$kde_running" -a "$kde_ver"x = 4x -a -x /usr/bin/pinentry-qt4 ] -then - export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # if KDE is detected and pinentry-qt exists, use pinentry-qt elif [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ] then @@ -71,10 +67,6 @@ then elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-gtk-2 ] then export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" -# otherwise test if pinentry-qt4 exists although KDE is not detected -elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt4 ] -then - export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # otherwise test if pinentry-qt exists although KDE is not detected elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ] then diff --git a/pinentry.spec b/pinentry.spec index e3394b3..f0f0aba 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,10 +1,9 @@ Name: pinentry -Version: 0.9.7 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Collection of simple PIN or passphrase entry dialogs -# qt & qt4 subpackage have different license, see subpackage definitions License: GPLv2+ URL: http://www.gnupg.org/aegypten/ Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2 @@ -17,10 +16,10 @@ BuildRequires: gcr-devel BuildRequires: gtk2-devel BuildRequires: libcap-devel BuildRequires: ncurses-devel -BuildRequires: qt4-devel BuildRequires: libgpg-error-devel BuildRequires: libassuan-devel BuildRequires: libsecret-devel +BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) Requires(pre): %{_sbindir}/update-alternatives Requires(post): /sbin/install-info @@ -56,14 +55,11 @@ http://www.gnupg.org/aegypten/ for details. This package contains the GTK GUI based version of the PIN entry dialog. %package qt -Summary: Passphrase/PIN entry dialog based on Qt4 -# original code for secstring.cpp doesn't allow GPL versions higher than 3 to be -# used -License: GPLv2 or GPLv3 +Summary: Passphrase/PIN entry dialog based on Qt5 Requires: %{name} = %{version}-%{release} Provides: %{name}-gui = %{version}-%{release} Obsoletes: pinentry-qt4 < 0.8.0-2 -Provides: pinentry-qt4 = %{version}-%{release} +Provides: pinentry-qt5 = %{version}-%{release} %description qt Pinentry is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the aegypten project; see @@ -82,20 +78,15 @@ This package contains the emacs based version of the PIN entry dialog. %prep %setup -q + %build - -%if 0%{?fedora} > 22 -# FTBFS on f23/gcc5 without this -CXXFLAGS="%{optflags} -std=c++11" -%endif - %configure \ --disable-rpath \ --disable-dependency-tracking \ --without-libcap \ --enable-pinentry-gnome3 \ --enable-pinentry-gtk2 \ - --enable-pinentry-qt \ + --enable-pinentry-qt5 \ --enable-pinentry-emacs \ --enable-libsecret @@ -105,9 +96,8 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -# Backwards compatibility +# Symlink for Backward compatibility ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk -# This changed in 0.9.6 ln -s pinentry-qt $RPM_BUILD_ROOT%{_bindir}/pinentry-qt4 install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry @@ -116,13 +106,6 @@ install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry rm -fv $RPM_BUILD_ROOT%{_infodir}/dir -# alternatives dropped at 0.7.6-3 (use %%trigger instead?) -%pre -%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||: -%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||: -%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||: -%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-emacs ||: - %post if [ -f %{_infodir}/pinentry.info* ]; then /sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir ||: @@ -134,7 +117,6 @@ if [ $1 -eq 0 -a -f %{_infodir}/pinentry.info* ] ; then fi %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS ChangeLog NEWS README THANKS TODO %{_bindir}/pinentry-curses @@ -145,17 +127,24 @@ fi %{_bindir}/pinentry-gnome3 %files gtk -%{_bindir}/pinentry-gtk %{_bindir}/pinentry-gtk-2 +# symlink for backward compatibility +%{_bindir}/pinentry-gtk %files qt %{_bindir}/pinentry-qt +# symlink for backward compatibility %{_bindir}/pinentry-qt4 %files emacs %{_bindir}/pinentry-emacs %changelog +* Sun Dec 31 2017 Rex Dieter - 1.1.0-1 +- 1.1.0 (#1397378) +- drop some old code/hacks/workarounds +- -qt: use Qt5 + * Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 88689f0..8b33b9e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9510b2de013e818dab619e468298703a pinentry-0.9.7.tar.bz2 -9010247575dd64f752acd8ae2afe85d5 pinentry-0.9.7.tar.bz2.sig +SHA512 (pinentry-1.1.0.tar.bz2) = 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd +SHA512 (pinentry-1.1.0.tar.bz2.sig) = e3f82c188041546df57dccfcff8c0957eae38437ab5f60890304eb7ddf8e7e345d8e09dfc5931f37233781621c6a8847179ca79e003d107e844ae67fdde0d575