[X2Go-Commits] [python-x2go] 01/01: python-x2go.spec: remove pycache handling from the files list.

[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 6196c1b7f2b60727e500a626682ecb825a1323e3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 19 23:15:13 2023 +0200

    python-x2go.spec: remove pycache handling from the files list.
    
    Python-2-variants don't have the concept of __pycache__ directories at
    all, so using %pycache_only there is redundant.
    
    Python-3-variants sprinkle __pycache__ directories wherever there are
    .py files, which means that they are conveniently contained in the
    "x2go" subdirectory of sitelib.
    
    Older *SuSE versions, including Leap, just ignored files or directories
    in the %files list that do not exist, but Tumbleweed is throwing an
    error if you try to include a file or directory that does not exist.
    
    The fix is easy: don't try to include the non-existent __pycache__
    top-level directory.
---
 debian/changelog | 10 ++++++++++
 python-x2go.spec | 12 +++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1ba54a..ca17d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,16 @@ python-x2go (0.6.1.4-0x2go1) UNRELEASED; urgency=medium
       variant.
     + Correctly drop python-configparser BR on *SuSE if we're building against
       Python 3 only.
+    + Remove pycache handling from the files list. Python-2-variants don't
+      have the concept of __pycache__ directories at all, so using
+      %pycache_only there is redundant. Python-3-variants sprinkle __pycache__
+      directories wherever there are .py files, which means that they are
+      conveniently contained in the "x2go" subdirectory of sitelib. Older
+      *SuSE versions, including Leap, just ignored files or directories in the
+      %files list that do not exist, but Tumbleweed is throwing an error if
+      you try to include a file or directory that does not exist. The fix is
+      easy: don't try to include the non-existent __pycache__ top-level
+      directory.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 01 Jan 2020 20:25:50 +0100
 
diff --git a/python-x2go.spec b/python-x2go.spec
index 56a8e4f..7900c7d 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -364,7 +364,6 @@ python3 setup.py install --skip-build --root %{buildroot}
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
 %{python2_sitelib}/x2go/
 %{python2_sitelib}/x2go-*
-%pycache_only %{python2_sitelib}/__pycache__
 %else
 %{python_sitelib}/x2go/
 %{python_sitelib}/x2go-*/
@@ -381,12 +380,11 @@ python3 setup.py install --skip-build --root %{buildroot}
 %defattr(-,root,root)
 %license COPYING
 %doc README* TODO
-%{python3_sitelib}/*
-%if 0%{?suse_version}
-%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
-%pycache_only %{python3_sitelib}/__pycache__
-%endif
-%endif
+%{python3_sitelib}/x2go/
+%{python3_sitelib}/x2go-*
+# pycache directories seem to be sprinkled across the x2go subdirectory, so
+# there's no need to include a rule for a top-level directory. It currently
+# will never exist.
 %endif
 
 

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