This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from e5452b6 x2godesktopsharing.spec: call lrelease before running qmake. new e62e6f6 x2godesktopsharing.spec: we actually care about SLE{S,D} 11.x still... fixup comment. new 8d41a55 x2godesktopsharing.spec: fix lrelease-qt5 call (missing number). new 949e8f6 x2godesktopsharing.spec: use Qt4 for SLES 11.x builds. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2godesktopsharing.spec | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit e62e6f6d5eb65c28048eb38ad01eb17b99aa4d42 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 13 01:20:10 2018 +0100 x2godesktopsharing.spec: we actually care about SLE{S,D} 11.x still... fixup comment. --- debian/changelog | 1 + x2godesktopsharing.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6df2acb..f9b180a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Build against Qt5. + Use qmake-qt5 globally. + Call lrelease before running qmake. + + We actually care about SLE{S,D} 11.x still... fixup comment. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 6fec6a3..bb70120 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -38,7 +38,7 @@ BuildRequires: qt5-rpm-macros BuildRequires: shadow Requires(pre): shadow %else -# Older SuSE versions (prior to 12.3) only have pwdutils, but we don't care. +# Older SuSE versions (prior to 12.3) only have pwdutils. %if 0%{?suse_version} BuildRequires: pwdutils Requires(pre): pwdutils -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 8d41a5522e36248f2393de37a7db3ab600866dc7 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 13 01:22:45 2018 +0100 x2godesktopsharing.spec: fix lrelease-qt5 call (missing number). --- debian/changelog | 1 + x2godesktopsharing.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9b180a..354032b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Use qmake-qt5 globally. + Call lrelease before running qmake. + We actually care about SLE{S,D} 11.x still... fixup comment. + + Fix lrelease-qt5 call (missing number). [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index bb70120..7584209 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -91,7 +91,7 @@ a local X11 session. %build -lrelease-qt x2godesktopsharing.pro +lrelease-qt5 x2godesktopsharing.pro qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro make %{?_smp_mflags} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
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
-
git-admin＠x2go.org