[X2Go-Commits] [python-x2go] 02/02: python-x2go.spec: don't override sections if the target name is python-x2go.

[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 bfa8961d0a45e9605d1852e24892c3e00ab62807
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 18 08:38:30 2019 +0100

    python-x2go.spec: don't override sections if the target name is python-x2go.
---
 debian/changelog | 1 +
 python-x2go.spec | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b7617d..632ed23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
     + Switch to actually using %{name_helper_python3}.
     + Same for %{name_helper_python2}.
     + Macros with empty bodies are not allowed, define them to be %{nil}.
+    + Don't override sections if the target name is python-x2go.
 
  -- 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 93014a3..568ff38 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -158,7 +158,9 @@ This Python module allows you to integrate X2Go client support into your
 Python applications by providing a Python-based X2Go client API.
 
 %if 0%{?with_python2}
+%if "%{name_helper_python2}" != "%{name}"
 %package -n %{name_helper_python2}-x2go
+%endif
 Summary:        %{summary}
 Group:          Development/Languages
 Requires:       python-gevent
@@ -175,6 +177,7 @@ Requires:       python-configparser
 Requires:       nxproxy
 %{?python_provide:%python_provide %{name_helper_python2}-x2go}
 
+%if "%{name_helper_python2}" != "%{name}"
 %description -n %{name_helper_python2}-x2go
 X2Go is a server based computing environment with:
    - session resuming
@@ -187,6 +190,7 @@ X2Go is a server based computing environment with:
 This Python module allows you to integrate X2Go client support into your
 Python applications by providing a Python-based X2Go client API.
 %endif
+%endif
 
 
 %if 0%{?with_python3}
@@ -302,7 +306,11 @@ python3 setup.py install --skip-build --root %{buildroot}
 %doc docs/build/html
 
 %if 0%{?with_python2}
+%if "%{name_helper_python2}" == "%{name}"
+%files
+%else
 %files -n %{name_helper_python2}-x2go
+%endif
 %defattr(-,root,root)
 %license COPYING
 %doc README* TODO

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