[X2Go-Commits] [x2goclient] 01/03: x2goclient.spec: rework Qt5 dependencies.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit cb6411c8bb962a5d91ce9cdf87f5231c2782e502
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 16 11:54:38 2021 +0200

    x2goclient.spec: rework Qt5 dependencies.
    
    Use a common set of PkgConfig()-based dependencies for the Qt 5
    libraries themselves and only make the linguist tools (lrelease)
    conditional.
---
 debian/changelog |  3 +++
 x2goclient.spec  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fda6de9..0e89a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     - x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead
       of using it as a string in the condition (which then leads to parsing
       error).
+    - x2goclient.spec: rework Qt5 dependencies. Use a common set of
+      PkgConfig()-based dependencies for the Qt 5 libraries themselves and
+      only make the linguist tools (lrelease) conditional.
   * debian/control:
     + Move to debian/control.in.
   * debian/control.in:
diff --git a/x2goclient.spec b/x2goclient.spec
index e140005..6c88867 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -34,19 +34,13 @@ buildrequires:  openldap2-devel
 BuildRequires:  openldap-devel
 %endif
 
-%if 0%{?suse_version}
 %if %{qt_version} == 4
+%if 0%{?suse_version}
 BuildRequires:  libqt4-devel
 %if 0%{?suse_version} >= 1310
 BuildRequires:  libqt4-linguist
 %endif
 %else
-%if %{qt_version} == 5
-BuildRequires:  libqt5-qtbase-devel
-%endif
-%endif
-%else
-%if %{qt_version} == 4
 %if 0%{?el5} || 0%{?el6}
 BuildRequires:  qt4-devel
 %else
@@ -54,7 +48,14 @@ BuildRequires:  qt-devel
 %endif
 %else
 %if %{qt_version} == 5
-BuildRequires:  qt5-devel
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5Widgets)
+%if 0%{?suse_version}
+BuildRequires:  libqt5-linguist
+%else
+BuildRequires:  qt5-linguist
 %endif
 %endif
 %endif

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