This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit b334614813c3b4091d068f50cff9c7ddaaf42a9a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 14 17:20:10 2014 +0200 openSUSE: Make Qt4 Linguist tools available for Makefile. --- debian/changelog | 1 + x2goclient.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1292b9b..12d047b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low of the x2goplugin-provide bin:package. * x2goclient.spec: + Adapt to building for openSUSE/SLES. + + openSUSE: Make Qt4 Linguist tools available for Makefile. [ Oleksandr Shneyder ] diff --git a/x2goclient.spec b/x2goclient.spec index cb39b53..623eb48 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -12,11 +12,15 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: openldap2-devel +%if 0%{?suse_version} +BuildRequires: libqt4-linguist +%else %if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel %endif +%endif %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 BuildRequires: qtbrowserplugin-static @@ -126,7 +130,7 @@ sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile test -f ChangeLog && cp ChangeLog txt/changelog || test -f debian/changelog && cp debian/changelog txt/changelog || true test -f ChangeLog.gitlog && cp ChangeLog.gitlog txt/git-info || true -%if 0%{?el5} +%if 0%{?el5} || 0%{?suse_version} sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git