This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 949e8f6849cdec27c1d3f4a3f81186b70c8223b8 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 13 01:24:38 2018 +0100 x2godesktopsharing.spec: use Qt4 for SLES 11.x builds. --- debian/changelog | 1 + x2godesktopsharing.spec | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 354032b..e69010a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Call lrelease before running qmake. + We actually care about SLE{S,D} 11.x still... fixup comment. + Fix lrelease-qt5 call (missing number). + + Use Qt4 for SLES 11.x builds. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 7584209..51c676b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -22,10 +22,15 @@ BuildRequires: update-desktop-files BuildRequires: desktop-file-utils %if 0%{?suse_version} +%if 0%{?suse_version} >= 1315 BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-linguist %else +BuildRequires: libqt4-devel +BuildRequires: qt-devel +%endif +%else BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-linguist @@ -91,8 +96,13 @@ a local X11 session. %build +%if 0%{?suse_version} && 0%{?suse_version} < 1315 +lrelease x2godesktopsharing.pro +qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro +%else lrelease-qt5 x2godesktopsharing.pro qmake-qt5 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