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