The package rpms/spyder.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/spyder.git/commit/?id=0656feb7a9a...
https://src.fedoraproject.org/cgit/rpms/spyder.git/commit/?id=fff9a965af4....
Change:
+ExclusiveArch: %{qt5_qtwebengine_arches}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 4fd0934c4af28f0ad6597856e45c4a642d0fa4c6
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Sep 26 13:51:03 2023 -0400
Use upstream PR for useless shebangs now that it’s rebased on 5.x
diff --git a/spyder-5.4.5-useless-shebangs.patch b/21372.patch
similarity index 88%
rename from spyder-5.4.5-useless-shebangs.patch
rename to 21372.patch
index d681a51..4c434db 100644
--- a/spyder-5.4.5-useless-shebangs.patch
+++ b/21372.patch
@@ -1,4 +1,4 @@
-From 8afc036557de13b132b01c833fc77569870767e2 Mon Sep 17 00:00:00 2001
+From 7ae5b5797248765a6dfec7378b83fbd7335ac946 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
Date: Mon, 25 Sep 2023 12:05:16 -0400
Subject: [PATCH 1/2] Remove useless shebang lines
@@ -16,7 +16,7 @@ script-like (has a “main routine” or other interesting side effects).
3 files changed, 3 deletions(-)
diff --git a/spyder/app/restart.py b/spyder/app/restart.py
-index de40fb917..041f89ded 100644
+index de40fb91716..041f89deddf 100644
--- a/spyder/app/restart.py
+++ b/spyder/app/restart.py
@@ -1,4 +1,3 @@
@@ -25,7 +25,7 @@ index de40fb917..041f89ded 100644
#
# Copyright © Spyder Project Contributors
diff --git a/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
b/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
-index 05b56b8e3..8dc9efb92 100644
+index 05b56b8e33e..8dc9efb9256 100644
--- a/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
+++ b/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
@@ -1,4 +1,3 @@
@@ -34,7 +34,7 @@ index 05b56b8e3..8dc9efb92 100644
"""
Created on Mon Dec 14 12:25:29 2020
diff --git a/spyder/utils/external/github.py b/spyder/utils/external/github.py
-index 56182433b..b0a5032e9 100644
+index 56182433ba9..b0a5032e998 100644
--- a/spyder/utils/external/github.py
+++ b/spyder/utils/external/github.py
@@ -1,4 +1,3 @@
@@ -42,11 +42,8 @@ index 56182433b..b0a5032e9 100644
# -*-coding: utf8 -*-
"""
---
-2.41.0
-
-From 0c02c04780a983f380f94897a2783433e6b64110 Mon Sep 17 00:00:00 2001
+From 3336314909489f2115dc5ed1fb1974fbdc6954c5 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
Date: Mon, 25 Sep 2023 12:07:20 -0400
Subject: [PATCH 2/2] Make tools/rm_whitespace.py executable
@@ -59,6 +56,3 @@ Subject: [PATCH 2/2] Make tools/rm_whitespace.py executable
diff --git a/tools/rm_whitespace.py b/tools/rm_whitespace.py
old mode 100644
new mode 100755
---
-2.41.0
-
diff --git a/spyder.spec b/spyder.spec
index 7a69252..4d25476 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -25,8 +25,7 @@ Patch: %{forgeurl}/pull/21367.patch
# Ensure no source files have useless shebangs
#
https://github.com/spyder-ide/spyder/pull/21372
-# PR opened against master, here rebased against the 5.x branch.
-Patch: spyder-5.4.5-useless-shebangs.patch
+Patch: %{forgeurl}/pull/21372.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
commit 3b056490de37d025c8d3ba4347d1a9530f9697e3
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 12:22:49 2023 -0400
Send a PR upstream for useless shebangs, replacing the downstream patch
diff --git a/spyder-5.4.5-useless-shebangs.patch b/spyder-5.4.5-useless-shebangs.patch
new file mode 100644
index 0000000..d681a51
--- /dev/null
+++ b/spyder-5.4.5-useless-shebangs.patch
@@ -0,0 +1,64 @@
+From 8afc036557de13b132b01c833fc77569870767e2 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
+Date: Mon, 25 Sep 2023 12:05:16 -0400
+Subject: [PATCH 1/2] Remove useless shebang lines
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no value in having a shebang (#!) line in a file that does not
+have the executable bit set in its filesystem permissions, even if it is
+script-like (has a “main routine” or other interesting side effects).
+---
+ spyder/app/restart.py | 1 -
+ spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy | 1 -
+ spyder/utils/external/github.py | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/spyder/app/restart.py b/spyder/app/restart.py
+index de40fb917..041f89ded 100644
+--- a/spyder/app/restart.py
++++ b/spyder/app/restart.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright © Spyder Project Contributors
+diff --git a/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
b/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
+index 05b56b8e3..8dc9efb92 100644
+--- a/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
++++ b/spyder/plugins/editor/widgets/tests/assets/ipython_file.ipy
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ """
+ Created on Mon Dec 14 12:25:29 2020
+diff --git a/spyder/utils/external/github.py b/spyder/utils/external/github.py
+index 56182433b..b0a5032e9 100644
+--- a/spyder/utils/external/github.py
++++ b/spyder/utils/external/github.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*-coding: utf8 -*-
+
+ """
+--
+2.41.0
+
+
+From 0c02c04780a983f380f94897a2783433e6b64110 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
+Date: Mon, 25 Sep 2023 12:07:20 -0400
+Subject: [PATCH 2/2] Make tools/rm_whitespace.py executable
+
+---
+ tools/rm_whitespace.py | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 tools/rm_whitespace.py
+
+diff --git a/tools/rm_whitespace.py b/tools/rm_whitespace.py
+old mode 100644
+new mode 100755
+--
+2.41.0
+
diff --git a/spyder.spec b/spyder.spec
index 0545f26..7a69252 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -23,6 +23,11 @@ Patch:
%{forgeurl}/commit/285ef8a385c29ca7874027f57ab9dc44cbffae97.patch
#
https://github.com/spyder-ide/spyder/pull/21367
Patch: %{forgeurl}/pull/21367.patch
+# Ensure no source files have useless shebangs
+#
https://github.com/spyder-ide/spyder/pull/21372
+# PR opened against master, here rebased against the 5.x branch.
+Patch: spyder-5.4.5-useless-shebangs.patch
+
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
@@ -81,10 +86,6 @@ find . -type f \( \
-name '*.rst' -o -name '*.md' -o -name '*.py' -o -name
'*.css' \
\) -exec dos2unix --keepdate '{}' '+'
-# Remove shebang
-sed -i '/^#!/d' spyder/utils/external/github.py
-sed -i '/^#!/d' spyder/app/restart.py
-
%generate_buildrequires
%pyproject_buildrequires
commit 27542f0fe5a38021d18f9eddbaf19334e13b7cfe
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 13:07:49 2023 -0400
Fix mixed tabs and spaces
These were accidentally introduced in a previous commit
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index 18f4a3a..0545f26 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -34,7 +34,7 @@ BuildRequires: python3-devel
BuildRequires: dos2unix
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
# Still required by guidelines for now since Fedora uses appstream-builder
# (
https://pagure.io/packaging-committee/issue/1053):
BuildRequires: libappstream-glib
@@ -63,9 +63,9 @@ components, such as the interactive console, in your own software.}
Summary: %{summary}
# For %%{_datadir}/icons
-Requires: hicolor-icon-theme
+Requires: hicolor-icon-theme
# Unbundled from spyder/plugins/help/utils/js/mathjax
-Requires: mathjax
+Requires: mathjax
%description -n python3-spyder %_description
commit d983194c4630e3313fee69c4a5ef476c265e9d21
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:42:58 2023 -0400
Replace downstream dep. version patch with commit/PR backports
diff --git a/21367.patch b/21367.patch
new file mode 100644
index 0000000..b056d14
--- /dev/null
+++ b/21367.patch
@@ -0,0 +1,67 @@
+From 60ae3c650d2c5778a12f5b5a3fcfec8fef63f507 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
+Date: Sun, 24 Sep 2023 08:21:13 -0400
+Subject: [PATCH] Bump jedi upper bound from <0.19.0 to <0.20.0
+
+This comes from python-lsp-server, which supports 0.19.x since 1.8.0.
+
+Fixes #21296.
+---
+ binder/environment.yml | 2 +-
+ requirements/main.yml | 2 +-
+ setup.py | 2 +-
+ spyder/dependencies.py | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/binder/environment.yml b/binder/environment.yml
+index 2e50b7f931c..9259ae23141 100644
+--- a/binder/environment.yml
++++ b/binder/environment.yml
+@@ -14,7 +14,7 @@ dependencies:
+ - diff-match-patch >=20181111
+ - intervaltree >=3.0.2
+ - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1
+-- jedi >=0.17.2,<0.19.0
++- jedi >=0.17.2,<0.20.0
+ - jellyfish >=0.7
+ - jsonschema >=3.2.0
+ - keyring >=17.0.0
+diff --git a/requirements/main.yml b/requirements/main.yml
+index aa2a3ddf40e..9966d16e151 100644
+--- a/requirements/main.yml
++++ b/requirements/main.yml
+@@ -12,7 +12,7 @@ dependencies:
+ - diff-match-patch >=20181111
+ - intervaltree >=3.0.2
+ - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1
+- - jedi >=0.17.2,<0.19.0
++ - jedi >=0.17.2,<0.20.0
+ - jellyfish >=0.7
+ - jsonschema >=3.2.0
+ - keyring >=17.0.0
+diff --git a/setup.py b/setup.py
+index 14655bd51a0..4e8cc34564a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -210,7 +210,7 @@ def run(self):
+ 'diff-match-patch>=20181111',
+ 'intervaltree>=3.0.2',
+
'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
+- 'jedi>=0.17.2,<0.19.0',
++ 'jedi>=0.17.2,<0.20.0',
+ 'jellyfish>=0.7',
+ 'jsonschema>=3.2.0',
+ 'keyring>=17.0.0',
+diff --git a/spyder/dependencies.py b/spyder/dependencies.py
+index bc12e38a2fb..0689efb32ae 100644
+--- a/spyder/dependencies.py
++++ b/spyder/dependencies.py
+@@ -40,7 +40,7 @@
+ INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
+ IPYTHON_REQVER = (
+
">=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1")
+-JEDI_REQVER = '>=0.17.2,<0.19.0'
++JEDI_REQVER = '>=0.17.2,<0.20.0'
+ JELLYFISH_REQVER = '>=0.7'
+ JSONSCHEMA_REQVER = '>=3.2.0'
+ KEYRING_REQVER = '>=17.0.0'
diff --git a/285ef8a385c29ca7874027f57ab9dc44cbffae97.patch
b/285ef8a385c29ca7874027f57ab9dc44cbffae97.patch
new file mode 100644
index 0000000..7d1194d
--- /dev/null
+++ b/285ef8a385c29ca7874027f57ab9dc44cbffae97.patch
@@ -0,0 +1,22 @@
+From 285ef8a385c29ca7874027f57ab9dc44cbffae97 Mon Sep 17 00:00:00 2001
+From: Carlos Cordoba <ccordoba12(a)gmail.com>
+Date: Thu, 14 Sep 2023 11:58:30 -0500
+Subject: [PATCH] Bump PyLSP version when using Spyder in dev mode
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c912a88a5ce..14655bd51a0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -251,7 +251,7 @@ def run(self):
+ reqs_to_loosen = {'python-lsp-server[all]', 'qtconsole',
'spyder-kernels'}
+ install_requires = [req for req in install_requires
+ if req.split(">")[0] not in reqs_to_loosen]
+- install_requires.append('python-lsp-server[all]>=1.7.4,<1.9.0')
++ install_requires.append('python-lsp-server[all]>=1.8.0,<1.10.0')
+ install_requires.append('qtconsole>=5.4.2,<5.6.0')
+ install_requires.append('spyder-kernels>=2.4.4,<2.6.0')
+
diff --git a/2beb128b6c71eb4d4556a2f79cb385a7352d16f9.patch
b/2beb128b6c71eb4d4556a2f79cb385a7352d16f9.patch
new file mode 100644
index 0000000..694c588
--- /dev/null
+++ b/2beb128b6c71eb4d4556a2f79cb385a7352d16f9.patch
@@ -0,0 +1,64 @@
+From 2beb128b6c71eb4d4556a2f79cb385a7352d16f9 Mon Sep 17 00:00:00 2001
+From: Carlos Cordoba <ccordoba12(a)gmail.com>
+Date: Wed, 13 Sep 2023 20:19:05 -0500
+Subject: [PATCH] Dependencies: Bump minimal required version of PyLSP
+
+---
+ binder/environment.yml | 2 +-
+ requirements/main.yml | 2 +-
+ setup.py | 2 +-
+ spyder/dependencies.py | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/binder/environment.yml b/binder/environment.yml
+index d15cc2a3e26..2e50b7f931c 100644
+--- a/binder/environment.yml
++++ b/binder/environment.yml
+@@ -31,7 +31,7 @@ dependencies:
+ - pyqt <5.16
+ - pyqtwebengine <5.16
+ - python-lsp-black >=1.2.0,<3.0.0
+-- python-lsp-server >=1.7.4,<1.8.0
++- python-lsp-server >=1.8.0,<1.9.0
+ - pyxdg >=0.26
+ - pyzmq >=22.1.0
+ - qdarkstyle >=3.0.2,<3.2.0
+diff --git a/requirements/main.yml b/requirements/main.yml
+index ca4f2576d0a..aa2a3ddf40e 100644
+--- a/requirements/main.yml
++++ b/requirements/main.yml
+@@ -29,7 +29,7 @@ dependencies:
+ - pyqt <5.16
+ - pyqtwebengine <5.16
+ - python-lsp-black >=1.2.0,<3.0.0
+- - python-lsp-server >=1.7.4,<1.8.0
++ - python-lsp-server >=1.8.0,<1.9.0
+ - pyzmq >=22.1.0
+ - qdarkstyle >=3.0.2,<3.2.0
+ - qstylizer >=0.2.2
+diff --git a/setup.py b/setup.py
+index a90bbc1be4b..c912a88a5ce 100644
+--- a/setup.py
++++ b/setup.py
+@@ -229,7 +229,7 @@ def run(self):
+ 'pyls-spyder>=0.4.0',
+ 'pyqt5<5.16',
+ 'pyqtwebengine<5.16',
+- 'python-lsp-server[all]>=1.7.4,<1.8.0',
++ 'python-lsp-server[all]>=1.8.0,<1.9.0',
+ 'pyxdg>=0.26;platform_system=="Linux"',
+ 'pyzmq>=22.1.0',
+ 'qdarkstyle>=3.0.2,<3.2.0',
+diff --git a/spyder/dependencies.py b/spyder/dependencies.py
+index 3a297b0edaf..bc12e38a2fb 100644
+--- a/spyder/dependencies.py
++++ b/spyder/dependencies.py
+@@ -54,7 +54,7 @@
+ PYGMENTS_REQVER = '>=2.0'
+ PYLINT_REQVER = '>=2.5.0,<3.0'
+ PYLINT_VENV_REQVER = '>=3.0.2'
+-PYLSP_REQVER = '>=1.7.4,<1.8.0'
++PYLSP_REQVER = '>=1.8.0,<1.9.0'
+ PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
+ PYLS_SPYDER_REQVER = '>=0.4.0'
+ PYXDG_REQVER = '>=0.26'
diff --git a/spyder.spec b/spyder.spec
index 866c4f1..18f4a3a 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -11,7 +11,17 @@ License: MIT
URL:
https://www.spyder-ide.org/
Source: %forgesource
-Patch: spyder_relax_versions.patch
+# Dependencies: Bump minimal required version of PyLSP
+#
https://github.com/spyder-ide/spyder/commit/2beb128b6c71eb4d4556a2f79cb38...
+Patch: %{forgeurl}/commit/2beb128b6c71eb4d4556a2f79cb385a7352d16f9.patch
+
+# Bump PyLSP version when using Spyder in dev mode
+#
https://github.com/spyder-ide/spyder/commit/285ef8a385c29ca7874027f57ab9d...
+Patch: %{forgeurl}/commit/285ef8a385c29ca7874027f57ab9dc44cbffae97.patch
+
+# Bump jedi upper bound from <0.19.0 to <0.20.0
+#
https://github.com/spyder-ide/spyder/pull/21367
+Patch: %{forgeurl}/pull/21367.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
diff --git a/spyder_relax_versions.patch b/spyder_relax_versions.patch
deleted file mode 100644
index cacc1a8..0000000
--- a/spyder_relax_versions.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a90bbc1be..c68fbb029 100644
---- a/setup.py
-+++ b/setup.py
-@@ -210,7 +210,7 @@ def run(self):
- 'diff-match-patch>=20181111',
- 'intervaltree>=3.0.2',
-
'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
-- 'jedi>=0.17.2,<0.19.0',
-+ 'jedi>=0.17.2',
- 'jellyfish>=0.7',
- 'jsonschema>=3.2.0',
- 'keyring>=17.0.0',
-@@ -229,7 +229,7 @@ def run(self):
- 'pyls-spyder>=0.4.0',
- 'pyqt5<5.16',
- 'pyqtwebengine<5.16',
-- 'python-lsp-server[all]>=1.7.4,<1.8.0',
-+ 'python-lsp-server>=1.7.4',
- 'pyxdg>=0.26;platform_system=="Linux"',
- 'pyzmq>=22.1.0',
- 'qdarkstyle>=3.0.2,<3.2.0',
commit 31c88b881923c05801987700054fa668133583d2
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 09:41:58 2023 -0400
Package the changelog and readme files as documentation
diff --git a/spyder.spec b/spyder.spec
index 1e7f59c..866c4f1 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -131,6 +131,9 @@ end
%files -n python3-spyder -f %{pyproject_files}
+%doc CHANGELOG.md
+%doc README.md
+
# A backed-up bundled mathjax directory from a previous upgrade may be present:
%ghost %{python3_sitelib}/spyder/plugins/help/utils/js/mathjax.rpmmoved
%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
commit 85a22a41ede37f442352fe808cebc522aa773800
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 09:38:56 2023 -0400
Use whitespace to break up the files list into logical sections
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index 4a2a9f1..1e7f59c 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -134,8 +134,10 @@ end
# A backed-up bundled mathjax directory from a previous upgrade may be present:
%ghost %{python3_sitelib}/spyder/plugins/help/utils/js/mathjax.rpmmoved
%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
+
%{_bindir}/spyder
%{_bindir}/spyder3
+
%{_metainfodir}/%{appname}.appdata.xml
%{_datadir}/applications/spyder.desktop
%{_datadir}/icons/spyder.png
commit d2d8fc41ea2b397d422be8bca0f3503246bed48e
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 09:37:29 2023 -0400
Comment the manual Requires
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index a0b8c72..4a2a9f1 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -52,8 +52,10 @@ components, such as the interactive console, in your own software.}
%package -n python3-spyder
Summary: %{summary}
-Requires: hicolor-icon-theme
-Requires: mathjax
+# For %%{_datadir}/icons
+Requires: hicolor-icon-theme
+# Unbundled from spyder/plugins/help/utils/js/mathjax
+Requires: mathjax
%description -n python3-spyder %_description
commit 17274e77fdd879621864f068ba8b0f273ce9fc21
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:29:40 2023 -0400
Add missing explicit BuildRequires on python3-devel
diff --git a/spyder.spec b/spyder.spec
index aa5f229..a0b8c72 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -20,6 +20,8 @@ ExcludeArch: %{ix86}
# to follow suit.
ExclusiveArch: %{qt5_qtwebengine_arches}
+BuildRequires: python3-devel
+
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
commit 3cdde2809646d492af3c4570c79a5f55d420a73a
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 09:08:38 2023 -0400
Tidy up AppStream metadata handling
- Validate in check, and add a validation with appstreamcli
- Use the _metainfodir macro in paths
diff --git a/spyder.spec b/spyder.spec
index 7705d5e..aa5f229 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -22,6 +22,15 @@ ExclusiveArch: %{qt5_qtwebengine_arches}
BuildRequires: dos2unix
+BuildRequires: desktop-file-utils
+# Still required by guidelines for now since Fedora uses appstream-builder
+# (
https://pagure.io/packaging-committee/issue/1053):
+BuildRequires: libappstream-glib
+# Matches what gnome-software and others use:
+BuildRequires: appstream
+
+%global appname org.spyder_ide.spyder
+
%global _description %{expand:
Spyder is a powerful scientific environment written in Python, for Python, and
designed by and for scientists, engineers and data analysts. It offers a unique
@@ -41,9 +50,6 @@ components, such as the interactive console, in your own software.}
%package -n python3-spyder
Summary: %{summary}
-BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
-
Requires: hicolor-icon-theme
Requires: mathjax
@@ -80,9 +86,6 @@ sed -i '/^#!/d' spyder/app/restart.py
desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/spyder.desktop
-# install appdata file
-appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
-
# cleanup
rm -rvf %{buildroot}%{_bindir}/spyder_win_post_install.py
@@ -94,6 +97,16 @@ ln -s %{_datadir}/javascript/mathjax/ \
ln -s spyder %{buildroot}%{_bindir}/spyder3
+%check
+# Still required by guidelines for now since Fedora uses appstream-builder
+# (
https://pagure.io/packaging-committee/issue/1053):
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml
+# Matches what gnome-software and others use:
+appstreamcli validate --nonet \
+ %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml
+
+
%pretrans -n python3-spyder -p <lua>
--[[Back up any bundled mathjax directory from the old package. See:
https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Repla...
@@ -119,7 +132,7 @@ end
%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
%{_bindir}/spyder
%{_bindir}/spyder3
-%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
+%{_metainfodir}/%{appname}.appdata.xml
%{_datadir}/applications/spyder.desktop
%{_datadir}/icons/spyder.png
commit 266870abc64bb388b42c005078922e828e1ef0f3
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:58:35 2023 -0400
Simplify fixing DOS line endings
diff --git a/spyder.spec b/spyder.spec
index 99369e3..7705d5e 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -20,6 +20,8 @@ ExcludeArch: %{ix86}
# to follow suit.
ExclusiveArch: %{qt5_qtwebengine_arches}
+BuildRequires: dos2unix
+
%global _description %{expand:
Spyder is a powerful scientific environment written in Python, for Python, and
designed by and for scientists, engineers and data analysts. It offers a unique
@@ -54,12 +56,10 @@ Requires: mathjax
# Remove bundled external dependencies
rm -rvf external-deps/ spyder/plugins/help/utils/js/mathjax
-# Remove DOS line endings
-for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
- sed "s|\r||g" $file > $file.new && \
- touch -r $file $file.new && \
- mv $file.new $file
-done
+# Fix DOS/CRNL line endings in files that may be installed
+find . -type f \( \
+ -name '*.rst' -o -name '*.md' -o -name '*.py' -o -name
'*.css' \
+ \) -exec dos2unix --keepdate '{}' '+'
# Remove shebang
sed -i '/^#!/d' spyder/utils/external/github.py
commit 2950d3d968667f2caeb51397233b80ce9f69f300
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:25:28 2023 -0400
Simplify removing bundled dependencies
Remove mathjax with the same “rm” command as external-deps/
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index 82d7274..99369e3 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -52,7 +52,7 @@ Requires: mathjax
%forgeautosetup -p1
# Remove bundled external dependencies
-rm -rvf external-deps/
+rm -rvf external-deps/ spyder/plugins/help/utils/js/mathjax
# Remove DOS line endings
for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
@@ -61,9 +61,6 @@ for file in `find -name "*.rst" -o -name "*.py" -o
-name "*.css"`; do
mv $file.new $file
done
-# remove bundled mathjax
-rm -rvf spyder/plugins/help/utils/js/mathjax
-
# Remove shebang
sed -i '/^#!/d' spyder/utils/external/github.py
sed -i '/^#!/d' spyder/app/restart.py
commit 86a65fbba3139b788d6d83da8008980cc3e7d5ae
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:24:00 2023 -0400
Explicitly remove bundled dependencies in prep
This was accidentally dropped in c3308d907692d513eb49d53362b570a8bbdd4dab.
diff --git a/spyder.spec b/spyder.spec
index 38f7c2d..82d7274 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -51,6 +51,9 @@ Requires: mathjax
%prep
%forgeautosetup -p1
+# Remove bundled external dependencies
+rm -rvf external-deps/
+
# Remove DOS line endings
for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
sed "s|\r||g" $file > $file.new && \
commit 71aaa81e3ee7209a0566bd0610be04d26e876a01
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:52:42 2023 -0400
Drop AppData XML file sed-patch
- It no longer has any effect
diff --git a/spyder.spec b/spyder.spec
index 804f04d..38f7c2d 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -51,8 +51,6 @@ Requires: mathjax
%prep
%forgeautosetup -p1
-sed -i 's/\xe2\x80\x8b//g' scripts/org.spyder_ide.spyder.appdata.xml
-
# Remove DOS line endings
for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
sed "s|\r||g" $file > $file.new && \
commit e045d216abb3988c8bf5ed1f81195f2863e60edb
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:21:16 2023 -0400
Reduce macro indirection in the spec file
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index a661397..804f04d 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -11,7 +11,7 @@ License: MIT
URL:
https://www.spyder-ide.org/
Source: %forgesource
-Patch: %{name}_relax_versions.patch
+Patch: spyder_relax_versions.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
@@ -36,7 +36,7 @@ components, such as the interactive console, in your own software.}
%description %_description
-%package -n python3-%{name}
+%package -n python3-spyder
Summary: %{summary}
BuildRequires: desktop-file-utils
@@ -45,7 +45,7 @@ BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
Requires: mathjax
-%description -n python3-%{name} %_description
+%description -n python3-spyder %_description
%prep
@@ -78,9 +78,9 @@ sed -i '/^#!/d' spyder/app/restart.py
%install
%pyproject_install
-%pyproject_save_files %{name}
+%pyproject_save_files spyder
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/%{name}.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/spyder.desktop
# install appdata file
appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
@@ -96,7 +96,7 @@ ln -s %{_datadir}/javascript/mathjax/ \
ln -s spyder %{buildroot}%{_bindir}/spyder3
-%pretrans -n python3-%{name} -p <lua>
+%pretrans -n python3-spyder -p <lua>
--[[Back up any bundled mathjax directory from the old package. See:
https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Repla...
]]
@@ -115,14 +115,14 @@ if st and st.type == "directory" then
end
-%files -n python3-%{name} -f %{pyproject_files}
+%files -n python3-spyder -f %{pyproject_files}
# A backed-up bundled mathjax directory from a previous upgrade may be present:
%ghost %{python3_sitelib}/spyder/plugins/help/utils/js/mathjax.rpmmoved
%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
-%{_bindir}/%{name}
-%{_bindir}/%{name}3
+%{_bindir}/spyder
+%{_bindir}/spyder3
%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/spyder.desktop
%{_datadir}/icons/spyder.png
commit 7902da2b6b303e2640763650b81f4e47a4f4c569
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Sep 25 11:19:03 2023 -0400
Do not number the sole Source
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index 8e3e2e1..a661397 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -9,7 +9,7 @@ Summary: Scientific Python Development Environment
%forgemeta
License: MIT
URL:
https://www.spyder-ide.org/
-Source0: %forgesource
+Source: %forgesource
Patch: %{name}_relax_versions.patch
commit c9424d38258336c0d898e6ce89df7a43e05e5808
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:43:11 2023 -0400
Adjust whitespace in base package metadata
The goal is improved legibility.
[skip changelog]
diff --git a/spyder.spec b/spyder.spec
index e44bc57..8e3e2e1 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -5,11 +5,14 @@ Name: spyder
Version: 5.4.5
Release: %autorelease
Summary: Scientific Python Development Environment
+
%forgemeta
License: MIT
URL:
https://www.spyder-ide.org/
Source0: %forgesource
+
Patch: %{name}_relax_versions.patch
+
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
commit c8bce87f3f5a03bf206a6930ecb55e9dc457fa7f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:41:23 2023 -0400
Make the spyder3 symlink relative
diff --git a/spyder.spec b/spyder.spec
index f236775..e44bc57 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -90,7 +90,7 @@ ln -s %{_datadir}/javascript/mathjax/ \
%{buildroot}%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
# provide spyder3 as symlink to spyder binary for continuity
-ln -s %{_bindir}/spyder %{buildroot}%{_bindir}/spyder3
+ln -s spyder %{buildroot}%{_bindir}/spyder3
%pretrans -n python3-%{name} -p <lua>
commit 824ea43a73e4c2a229558f1ae9a145a77e612df7
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:40:34 2023 -0400
Remove obsolete ldconfig_scriptlets macro
diff --git a/spyder.spec b/spyder.spec
index ede7aaf..f236775 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -92,8 +92,6 @@ ln -s %{_datadir}/javascript/mathjax/ \
# provide spyder3 as symlink to spyder binary for continuity
ln -s %{_bindir}/spyder %{buildroot}%{_bindir}/spyder3
-%ldconfig_scriptlets
-
%pretrans -n python3-%{name} -p <lua>
--[[Back up any bundled mathjax directory from the old package. See:
commit 93140021d1d5223b63f603a82eee4ba2f6d957d6
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Sep 24 08:39:55 2023 -0400
Updated description from upstream
diff --git a/spyder.spec b/spyder.spec
index 6e828d1..ede7aaf 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -18,16 +18,17 @@ ExcludeArch: %{ix86}
ExclusiveArch: %{qt5_qtwebengine_arches}
%global _description %{expand:
-Spyder is a powerful scientific environment written in Python, for
-Python, and designed by and for scientists, engineers and data
-analysts. It features a unique combination of the advanced editing,
-analysis, debugging and profiling functionality of a comprehensive
-development tool with the data exploration, interactive execution, deep
-inspection and beautiful visualization capabilities of an analysis
-package. Furthermore, Spyder offers built-in integration with many
-popular scientific libraries, including NumPy, SciPy, Pandas, IPython,
-QtConsole, Matplotlib, SymPy, and more, and can be extended further
-with full plugin support.}
+Spyder is a powerful scientific environment written in Python, for Python, and
+designed by and for scientists, engineers and data analysts. It offers a unique
+combination of the advanced editing, analysis, debugging, and profiling
+functionality of a comprehensive development tool with the data exploration,
+interactive execution, deep inspection, and beautiful visualization
+capabilities of a scientific package.
+
+Beyond its many built-in features, its abilities can be extended even further
+via its plugin system and API. Furthermore, Spyder can also be used as a PyQt5
+extension library, allowing you to build upon its functionality and embed its
+components, such as the interactive console, in your own software.}
%description %_description
commit 9dc7cf6d0d44eaadbd0b64557098d85d4015d2a3
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Sep 24 16:06:27 2023 +0200
Drop versioned patch
This won't work with release monitoring and other automation
tools like Packit.
diff --git a/spyder.spec b/spyder.spec
index 05acf6f..6e828d1 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -9,7 +9,7 @@ Summary: Scientific Python Development Environment
License: MIT
URL:
https://www.spyder-ide.org/
Source0: %forgesource
-Patch: %{name}-%{version}_relax_versions.patch
+Patch: %{name}_relax_versions.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
diff --git a/spyder-5.4.5_relax_versions.patch b/spyder_relax_versions.patch
similarity index 100%
rename from spyder-5.4.5_relax_versions.patch
rename to spyder_relax_versions.patch
commit 0656feb7a9a7fbf72021f02361f7c6748c0672e1
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Sep 24 15:42:10 2023 +0200
Add ExclusiveArch
- Follow suit since we depend on `pyqtwebengine`
diff --git a/spyder.spec b/spyder.spec
index ff48b16..05acf6f 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -13,6 +13,9 @@ Patch: %{name}-%{version}_relax_versions.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
+# Taken from pyqtwebengine's spec file. Since we require this, we need
+# to follow suit.
+ExclusiveArch: %{qt5_qtwebengine_arches}
%global _description %{expand:
Spyder is a powerful scientific environment written in Python, for
commit d6fb669fd45cb3ae9b531a59a55df97205b1ad39
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Sep 24 13:31:23 2023 +0200
Update to 5.4.5 (RHBZ#2220598)
diff --git a/.gitignore b/.gitignore
index 25c9536..54d475a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
/v5.2.1.tar.gz
/v5.3.0.tar.gz
/v5.3.1.tar.gz
+/spyder-5.3.1.tar.gz
+/spyder-5.4.5.tar.gz
diff --git a/sources b/sources
index 97aed91..a8ac661 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v5.3.1.tar.gz) =
2501ddc45df11671b1a318eb33b50788b334ab10fbafb97a9491775a0efcc6a57814672068ab84314f9cb43961d6fabd9b906fb164cd58c77b6d6ecf0d6621e6
+SHA512 (spyder-5.4.5.tar.gz) =
d938e3e64c22837bd4a7ab55822e9d763842cadba3cfb3de952652164054a4b87c2495bd8ae2617dbdd8bad5120e84e9017269d4bcdd6cbf73fb3d4dddbcad8f
diff --git a/spyder-5.3.1_relax_versions.patch b/spyder-5.3.1_relax_versions.patch
deleted file mode 100644
index d8cb787..0000000
--- a/spyder-5.3.1_relax_versions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py-orig 2022-05-28 14:38:47.486105605 -0500
-+++ setup.py 2022-05-28 14:39:47.257341635 -0500
-@@ -209,7 +209,7 @@
- 'cookiecutter>=1.6.0',
- 'diff-match-patch>=20181111',
- 'intervaltree>=3.0.2',
-- 'ipython>=7.31.1,<8.0.0',
-+ 'ipython>=7.31.1',
- 'jedi>=0.17.2,<0.19.0',
- 'jellyfish>=0.7',
- 'jsonschema>=3.2.0',
-@@ -228,7 +228,7 @@
- 'pyls-spyder>=0.4.0',
- 'pyqt5<5.16',
- 'pyqtwebengine<5.16',
-- 'python-lsp-server[all]>=1.4.1,<1.5.0',
-+ 'python-lsp-server>=1.4.1,<1.5.0',
- 'pyxdg>=0.26;platform_system=="Linux"',
- 'pyzmq>=22.1.0',
- 'qdarkstyle>=3.0.2,<3.1.0',
diff --git a/spyder-5.4.5_relax_versions.patch b/spyder-5.4.5_relax_versions.patch
new file mode 100644
index 0000000..cacc1a8
--- /dev/null
+++ b/spyder-5.4.5_relax_versions.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index a90bbc1be..c68fbb029 100644
+--- a/setup.py
++++ b/setup.py
+@@ -210,7 +210,7 @@ def run(self):
+ 'diff-match-patch>=20181111',
+ 'intervaltree>=3.0.2',
+
'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
+- 'jedi>=0.17.2,<0.19.0',
++ 'jedi>=0.17.2',
+ 'jellyfish>=0.7',
+ 'jsonschema>=3.2.0',
+ 'keyring>=17.0.0',
+@@ -229,7 +229,7 @@ def run(self):
+ 'pyls-spyder>=0.4.0',
+ 'pyqt5<5.16',
+ 'pyqtwebengine<5.16',
+- 'python-lsp-server[all]>=1.7.4,<1.8.0',
++ 'python-lsp-server>=1.7.4',
+ 'pyxdg>=0.26;platform_system=="Linux"',
+ 'pyzmq>=22.1.0',
+ 'qdarkstyle>=3.0.2,<3.2.0',
diff --git a/spyder.spec b/spyder.spec
index 0d31c06..ff48b16 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -2,7 +2,7 @@
%global forgeurl
https://github.com/spyder-ide/spyder/
Name: spyder
-Version: 5.3.1
+Version: 5.4.5
Release: %autorelease
Summary: Scientific Python Development Environment
%forgemeta
commit c3308d907692d513eb49d53362b570a8bbdd4dab
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Sep 24 10:01:36 2023 +0200
Spec file overhaul
- Use forge macros
- Use Python RPM macros
- Restructure spec file
- Clean up obsolete BRs
diff --git a/spyder.spec b/spyder.spec
index 71e7393..0d31c06 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -1,59 +1,50 @@
-
-%global _description %{expand:
-Spyder is a powerful scientific environment written in Python, for Python, and
-designed by and for scientists, engineers and data analysts. It features a
-unique combination of the advanced editing, analysis, debugging and profiling
-functionality of a comprehensive development tool with the data exploration,
-interactive execution, deep inspection and beautiful visualization capabilities
-of an analysis package. Furthermore, Spyder offers built-in integration with
-many popular scientific libraries, including NumPy, SciPy, Pandas, IPython,
-QtConsole, Matplotlib, SymPy, and more, and can be extended further with
-full plugin support.
-}
+# Use forge macros for pulling from GitHub
+%global forgeurl
https://github.com/spyder-ide/spyder/
Name: spyder
Version: 5.3.1
Release: %autorelease
Summary: Scientific Python Development Environment
-
-Source0:
https://github.com/%{name}-ide/%{name}/archive/v%{version}.tar.gz
-
-Patch0: %{name}-%{version}_relax_versions.patch
+%forgemeta
License: MIT
URL:
https://www.spyder-ide.org/
+Source0: %forgesource
+Patch: %{name}-%{version}_relax_versions.patch
BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
-%description
-%_description
+%global _description %{expand:
+Spyder is a powerful scientific environment written in Python, for
+Python, and designed by and for scientists, engineers and data
+analysts. It features a unique combination of the advanced editing,
+analysis, debugging and profiling functionality of a comprehensive
+development tool with the data exploration, interactive execution, deep
+inspection and beautiful visualization capabilities of an analysis
+package. Furthermore, Spyder offers built-in integration with many
+popular scientific libraries, including NumPy, SciPy, Pandas, IPython,
+QtConsole, Matplotlib, SymPy, and more, and can be extended further
+with full plugin support.}
+
+%description %_description
%package -n python3-%{name}
Summary: %{summary}
-%{?python_provide:%python_provide python3-%{name}}
-
-BuildRequires: python3-devel
-BuildRequires: python3-sphinx
-BuildRequires: python3-setuptools
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
-Requires: hicolor-icon-theme
-Requires: mathjax
+Requires: hicolor-icon-theme
+Requires: mathjax
-%description -n python3-%{name}
-%_description
+%description -n python3-%{name} %_description
%prep
-%setup -q -n %{name}-%{version}
-sed -i 's/\xe2\x80\x8b//g' scripts/org.spyder_ide.spyder.appdata.xml
-
-%patch0
+%forgeautosetup -p1
-rm -rf PKG-INFO external-deps
+sed -i 's/\xe2\x80\x8b//g' scripts/org.spyder_ide.spyder.appdata.xml
# Remove DOS line endings
for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
@@ -65,23 +56,29 @@ done
# remove bundled mathjax
rm -rvf spyder/plugins/help/utils/js/mathjax
+# Remove shebang
+sed -i '/^#!/d' spyder/utils/external/github.py
+sed -i '/^#!/d' spyder/app/restart.py
+
+
+%generate_buildrequires
+%pyproject_buildrequires
+
%build
-%py3_build
+%pyproject_wheel
%install
-mkdir -p %{buildroot}%{_datadir}/appdata
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+%pyproject_install
+%pyproject_save_files %{name}
-%py3_install
desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/%{name}.desktop
# install appdata file
appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
# cleanup
-rm -rvf %{buildroot}%{python3_sitelib}/spyderlib/doc/{.buildinfo,.doctrees}
rm -rvf %{buildroot}%{_bindir}/spyder_win_post_install.py
# replace bundled mathjax with a symlink to the system mathjax
@@ -113,11 +110,10 @@ if st and st.type == "directory" then
end
-%files -n python3-%{name}
-%{python3_sitelib}/spyder-*.egg-info
-%{python3_sitelib}/spyder/
+%files -n python3-%{name} -f %{pyproject_files}
# A backed-up bundled mathjax directory from a previous upgrade may be present:
%ghost %{python3_sitelib}/spyder/plugins/help/utils/js/mathjax.rpmmoved
+%{python3_sitelib}/spyder/plugins/help/utils/js/mathjax
%{_bindir}/%{name}
%{_bindir}/%{name}3
%{_datadir}/metainfo/org.spyder_ide.spyder.appdata.xml
commit fff9a965af418ca076758ce47b2fd2034796c42e
Author: Sandro <devel(a)penguinpee.nl>
Date: Sat Sep 23 18:18:28 2023 +0200
Whitespace changes
- Use spaces NOT tabs (this is Python after all)
- Be consistent with intersection spacing
diff --git a/spyder.spec b/spyder.spec
index 53930f9..71e7393 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -11,41 +11,42 @@ QtConsole, Matplotlib, SymPy, and more, and can be extended further
with
full plugin support.
}
-Name: spyder
-Version: 5.3.1
-Release: %autorelease
-Summary: Scientific Python Development Environment
+Name: spyder
+Version: 5.3.1
+Release: %autorelease
+Summary: Scientific Python Development Environment
-Source0:
https://github.com/%{name}-ide/%{name}/archive/v%{version}.tar.gz
+Source0:
https://github.com/%{name}-ide/%{name}/archive/v%{version}.tar.gz
-Patch0: %{name}-%{version}_relax_versions.patch
-License: MIT
-URL:
https://www.spyder-ide.org/
-BuildArch: noarch
+Patch0: %{name}-%{version}_relax_versions.patch
+License: MIT
+URL:
https://www.spyder-ide.org/
+BuildArch: noarch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
-
+ExcludeArch: %{ix86}
%description
%_description
+
%package -n python3-%{name}
-Summary: %{summary}
+Summary: %{summary}
%{?python_provide:%python_provide python3-%{name}}
-BuildRequires: python3-devel
-BuildRequires: python3-sphinx
-BuildRequires: python3-setuptools
-BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
+BuildRequires: python3-devel
+BuildRequires: python3-sphinx
+BuildRequires: python3-setuptools
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
-Requires: hicolor-icon-theme
-Requires: mathjax
+Requires: hicolor-icon-theme
+Requires: mathjax
%description -n python3-%{name}
%_description
+
%prep
%setup -q -n %{name}-%{version}
sed -i 's/\xe2\x80\x8b//g' scripts/org.spyder_ide.spyder.appdata.xml
@@ -56,9 +57,9 @@ rm -rf PKG-INFO external-deps
# Remove DOS line endings
for file in `find -name "*.rst" -o -name "*.py" -o -name
"*.css"`; do
- sed "s|\r||g" $file > $file.new && \
- touch -r $file $file.new && \
- mv $file.new $file
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
done
# remove bundled mathjax