This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 242e073 x2goclient.spec: fix condition with maybe-undefined macro. new fd4e536 x2goclient.spec: typo fix in vendor macro. new f261e7e x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead of using it as a string in the condition (which then leads to parsing error). The 2 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 | 4 ++++ x2goclient.spec | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit fd4e536e707cd1f672dc907b131c9c08f46dc0ef Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 16 00:44:20 2021 +0200 x2goclient.spec: typo fix in vendor macro. --- debian/changelog | 1 + x2goclient.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 019fbb5..eb029cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Makefile: allow passing down variables that are safe to pass via the environment. - x2goclient.spec: fix condition with maybe-undefined macro. + - x2goclient.spec: typo fix in vendor macro. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.spec b/x2goclient.spec index 87fc01c..150fa85 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -6,7 +6,7 @@ Release: 0.0x2go1%{?dist} %define qt_version 4 # FC31+ or EPEL 8. # Tumbleweed or *SuSE 15.3+. -%if ( "%{?_vendor}" == "redhat" && ( 0%{?fedora} > 31 || 0%{?el8} ) ) || ( "%{?_vedor}" == "suse" && ( 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 ) ) +%if ( "%{?_vendor}" == "redhat" && ( 0%{?fedora} > 31 || 0%{?el8} ) ) || ( "%{?_vendor}" == "suse" && ( 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 ) ) %define qt_version 5 %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f261e7e0441bcb71389371168db250d58a24b457 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 16 01:28:52 2021 +0200 x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead of using it as a string in the condition (which then leads to parsing error). --- debian/changelog | 3 +++ x2goclient.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eb029cc..fda6de9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium environment. - x2goclient.spec: fix condition with maybe-undefined macro. - x2goclient.spec: typo fix in vendor macro. + - x2goclient.spec: expand %{_qt4_bindir} to integer if it's set, instead + of using it as a string in the condition (which then leads to parsing + error). * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.spec b/x2goclient.spec index 150fa85..e140005 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -148,7 +148,7 @@ test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true %build %define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}' QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}' %if %{qt_version} == 4 -%if 0%{?_qt4_bindir} +%if 0%{?_qt4_bindir:1} export PATH=%{_qt4_bindir}:$PATH %endif %if 0%{?el5} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org