[X2Go-Commits] [x2goclient] 36/38: pyhoca-cli.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 x2goclient.

commit de2d79e807c918dacf9176adeadbd39caaa810c6
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Aug 22 02:57:49 2023 +0200

    pyhoca-cli.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
    "pyhoca" 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 ++++++++++
 pyhoca-cli.spec  | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77465248..62a87d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,16 @@ pyhoca-cli (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
   * pyhoca-cli.spec:
     + Change http:// to https:// links where appropriate.
     + Drop Python 2 support for OpenSuSE Leap 15.4+ and Tumbleweed (and ALP).
+    + 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 "pyhoca" 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>  Thu, 26 Dec 2019 17:03:42 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 988c5e2c..0d59dcab 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -248,7 +248,6 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
 %{python2_sitelib}/pyhoca/
 %{python2_sitelib}/PyHoca_CLI*
-%pycache_only %{python2_sitelib}/__pycache__
 %else
 %{python_sitelib}/pyhoca/
 %{python_sitelib}/PyHoca_CLI*
@@ -261,15 +260,6 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %if 0%{?with_python3}
 %{python3_sitelib}/pyhoca/
 %{python3_sitelib}/PyHoca_CLI*
-%if 0%{?suse_version}
-%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
-%if ( 0%{?sle_version} >= 150000 ) || ( 0%{?suse_version} > 1500 )
-%pycache_only %{python3_sitelib}/pyhoca/cli/__pycache__
-%else
-%pycache_only %{python3_sitelib}/__pycache__
-%endif
-%endif
-%endif
 %endif
 %{_mandir}/man1/%{name}.1*
 

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