This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 57e1922 sharetray.cpp: fix another misleading if indentation warning. new 1e04dbb x2godesktopsharing.spec: remove obsolete EPEL 5 support. new df63afc x2godesktopsharing.spec: whitespace only. new bfb7d3d x2godesktopsharing.spec: build against Qt5. 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 | 32 ++++++++------------------------ 2 files changed, 11 insertions(+), 24 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 1e04dbb566fb0b5f9c6242ec42cb70e1982aaf07 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 23:51:30 2018 +0100 x2godesktopsharing.spec: remove obsolete EPEL 5 support. --- debian/changelog | 1 + x2godesktopsharing.spec | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 214ee4f..24eb51d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium something else, like... gcc or qmake or qt(4)-dev, but it isn't. + Whitespace only. + Add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets. + + Remove obsolete EPEL 5 support. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e9ca266..dbf1dad 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -27,7 +27,7 @@ BuildRequires: libqt4-devel BuildRequires: libqt4-linguist %endif %else -%if 0%{?el5} || 0%{?el6} +%if 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel @@ -65,19 +65,14 @@ Requires: x2goserver >= 4.0.0.0 %if 0%{?suse_version} Requires: procps %else -%if 0%{?el5} || 0%{?el6} +%if 0%{?el6} Requires: sysvinit-tools %else Requires: procps-ng %endif %endif -%if 0%{?el5} -# For compatibility with EPEL5 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%else BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif %description X2Go is a server based computing environment with @@ -98,15 +93,11 @@ a local X11 session. %build -%if 0%{?el5} -%{_libdir}/qt4/bin/qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro -%else %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 -%endif 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 df63afc10a64fe579f4242b10815323d7f1367cf Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 23:53:44 2018 +0100 x2godesktopsharing.spec: whitespace only. --- debian/changelog | 1 + x2godesktopsharing.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 24eb51d..72ba5df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Whitespace only. + Add Pre-dependencies on shadow/pwdutils/shadow-utils for scriptlets. + Remove obsolete EPEL 5 support. + + Whitespace only. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index dbf1dad..d37d020 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -171,4 +171,3 @@ fi %changelog - -- 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 bfb7d3de6b63814daebe6ac7f4099028d6f84f2b Author: Mihai Moldovan <ionic@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
-
git-admin＠x2go.org