[X2Go-Commits] [pinentry-x2go] 04/04: pinentry-x2go.spec: use Qt5 across all platforms. Will fail on SLE 12.0, but work after upgrading to SLE 12.1+.

git-admin at x2go.org git-admin at x2go.org
Fri Nov 23 04:26:52 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pinentry-x2go.

commit daf633e2c9388919c79b3f5c92b89f1ef8658775
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 23 04:12:16 2018 +0100

    pinentry-x2go.spec: use Qt5 across all platforms. Will fail on SLE 12.0, but work after upgrading to SLE 12.1+.
---
 debian/changelog   |  2 ++
 pinentry-x2go.spec | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5e5212..0ab4f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low
       something else, like... gcc or qmake or qt(4)-dev, but it isn't.
     - Remove old distro support.
     - Use more curly braces, delete superfluous semicolons and unused code.
+    - Use Qt5 across all platforms. Will fail on SLE 12.0, but work after
+      upgrading to SLE 12.1+.
 
   [ Mike Gabriel ]
   * New upstream version (0.7.5.10):
diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec
index af31d54..7a55185 100644
--- a/pinentry-x2go.spec
+++ b/pinentry-x2go.spec
@@ -2,7 +2,7 @@ Name:           pinentry-x2go
 Version:        0.7.5.10
 Release:        0.0x2go1%{?dist}
 Group:          Applications/Communications
-Summary:        Qt4-based PIN or pass-phrase entry dialog for x2goclient
+Summary:        Qt5-based PIN or pass-phrase entry dialog for x2goclient
 License:        GPL-2.0
 URL:            http://www.x2go.org/
 Source0:        http://code.x2go.org/releases/source/%name/%name-%version.tar.gz
@@ -10,10 +10,13 @@ Source0:        http://code.x2go.org/releases/source/%name/%name-%version.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf >= 2.57, automake >= 1.7.6
 BuildRequires:  ncurses-devel
-%if 0%{?el6}
-BuildRequires:  qt4-devel
+%if 0%{?suse_version}
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  libqt5-linguist
 %else
-BuildRequires:  qt-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-linguist
+BuildRequires:  qt5-rpm-macros
 %endif
 
 %if 0%{?fedora} || 0%{?rhel}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git


More information about the x2go-commits mailing list