[X2Go-Commits] [python-x2go] 01/01: python-x2go.spec: merge python(2)-x2go section in main section, since we cannot redefine subpackages.

[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 00ee1ceae8cd6e51a4cbae721355b34d25301b5e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 2 04:04:18 2018 +0200

    python-x2go.spec: merge python(2)-x2go section in main section, since we cannot redefine subpackages.
---
 debian/changelog |  2 ++
 python-x2go.spec | 27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b97b56..6b86298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
       python{2,3}-python-xlib.
     - Local %defines are buggy in older RPM implementations, work around by
       using %global instead.
+    - Merge python(2)-x2go section in main section, since we cannot redefine
+      subpackages.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Sep 2017 14:15:05 +0200
 
diff --git a/python-x2go.spec b/python-x2go.spec
index 003a07a..a781279 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -71,18 +71,8 @@ This Python module allows you to integrate X2Go client support into your
 Python applications by providing a Python-based X2Go client API.
 
 
-%package        doc
-Summary:        Python X2Go client API documentation
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-
-%description    doc
-This package contains the Python X2Go client API documentation.
-
 # Let's assume that RHEL/EPEL 8 finally introduce proper Python 3 support...
-%if 0%{?rhel} && 0%{?rhel} < 8
-%package
-%else
+%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8
 %package -n python2-x2go
 %endif
 Summary:        %{summary}
@@ -101,11 +91,8 @@ Requires:       python-configparser
 Requires:       nxproxy
 %{?python_provide:%python_provide python2-x2go}
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-%description
-%else
+%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8
 %description -n python2-x2go
-%endif
 X2Go is a server based computing environment with:
    - session resuming
    - low bandwidth support
@@ -116,6 +103,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
 
 
 %if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 )
@@ -150,6 +138,15 @@ Python applications by providing a Python-based X2Go client API.
 %endif # with_python3
 
 
+%package        doc
+Summary:        Python X2Go client API documentation
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+This package contains the Python X2Go client API documentation.
+
+
 %prep
 %setup -q
 # Remove shbang from library scripts

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