[X2Go-Commits] [python-x2go] 01/02: python-x2go.spec: macros with empty bodies are not allowed, define them to be %{nil}.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 27c232160dc846d599a92668416e70d1db8094c4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 18 08:26:53 2019 +0100

    python-x2go.spec: macros with empty bodies are not allowed, define them to be %{nil}.
---
 debian/changelog |  1 +
 python-x2go.spec | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e671322..2b7617d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
     + Same thing as name_helper_python2 for Python 2 names.
     + Switch to actually using %{name_helper_python3}.
     + Same for %{name_helper_python2}.
+    + Macros with empty bodies are not allowed, define them to be %{nil}.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 22 Nov 2019 08:19:40 +0100
 
diff --git a/python-x2go.spec b/python-x2go.spec
index c75ba10..93014a3 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -23,7 +23,7 @@
 %global name_helper_python2 python2
 %{?!python_module:%global python_module() python-%{**} python3-%{**}}
 %else
-%global name_helper_python2
+%global name_helper_python2 %{nil}
 %{?!python_module:%global python_module() python3-%{**}}
 %endif
 %else
@@ -33,7 +33,7 @@
 %global name_helper_python2 python2
 %{?!python_module:%global python_module() python-%{**} python%{python3_pkgversion}-%{**}}
 %else
-%global name_helper_python2
+%global name_helper_python2 %{nil}
 %{?!python_module:%global python_module() python%{python3_pkgversion}-%{**}}
 %endif
 %else
@@ -42,18 +42,18 @@
 %global name_helper_python2 python
 %{?!python_module:%global python_module() python-%{**} python34-%{**}}
 %else
-%global name_helper_python2
+%global name_helper_python2 %{nil}
 %{?!python_module:%global python_module() python34-%{**}}
 %endif
 %endif
 %endif
 %else
-%global name_helper_python3
+%global name_helper_python3 %{nil}
 %if 0%{?with_python2}
 %global name_helper_python2 python
 %{?!python_module:%global python_module() python-%{**}}
 %else
-%global name_helper_python2
+%global name_helper_python2 %{nil}
 %{?!python_module:%global python_module()}
 %endif
 %endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git