[X2Go-Commits] [x2godesktopsharing] 03/03: x2godesktopsharing.spec: build against Qt5.

[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 x2godesktopsharing.

commit bfb7d3de6b63814daebe6ac7f4099028d6f84f2b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 12 23:54:16 2018 +0100

    x2godesktopsharing.spec: build against Qt5.
---
 debian/changelog        |  1 +
 x2godesktopsharing.spec | 20 +++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72ba5df..7b39ec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
     + Add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets.
     + Remove obsolete EPEL 5 support.
     + Whitespace only.
+    + Build against Qt5.
 
   [ Mike Gabriel ]
   * New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index d37d020..a5ff585 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -22,16 +22,14 @@ BuildRequires:  update-desktop-files
 BuildRequires:  desktop-file-utils
 
 %if 0%{?suse_version}
-BuildRequires:  libqt4-devel
-%if 0%{?suse_version} >= 1310
-BuildRequires:  libqt4-linguist
-%endif
-%else
-%if 0%{?el6}
-BuildRequires:  qt4-devel
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  libqt5-qtsvg-devel
+BuildRequires:  libqt5-linguist
 %else
-BuildRequires:  qt-devel
-%endif
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtsvg-devel
+BuildRequires:  qt5-linguist
+BuildRequires:  qt5-rpm-macros
 %endif
 
 # for useradd/groupadd
@@ -93,11 +91,7 @@ a local X11 session.
 
 
 %build
-%if 0%{?suse_version}
 qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro
-%else
-qmake-qt4 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro
-%endif
 make %{?_smp_mflags}
 
 

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