[packages/subdownloader] - rel 7, fix sphinx compatibility
baggins
baggins at pld-linux.org
Sun Mar 23 14:04:08 CET 2025
commit 94849a8264e5a638fada499b6c38f805c25eb9c8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Mar 23 14:15:25 2025 +0100
- rel 7, fix sphinx compatibility
fix-python_requires-syntax.patch | 22 ++++++++++++++++++++++
no-sphinx-deprecated.patch | 28 ++++++++++++++++++++++++++++
subdownloader.spec | 9 ++++++++-
3 files changed, 58 insertions(+), 1 deletion(-)
---
diff --git a/subdownloader.spec b/subdownloader.spec
index 3a7fb6d..81ebdc3 100644
--- a/subdownloader.spec
+++ b/subdownloader.spec
@@ -3,7 +3,7 @@ Summary: Fast and Easy Subtitle Downloader
Summary(pl.UTF-8): Narzędzie do automatycznego ściągania/wysyłania podpisów do plików wideo
Name: subdownloader
Version: 2.1.0
-Release: 6
+Release: 7
License: GPL v3
Group: X11/Applications/Multimedia
Source0: https://github.com/subdownloader/subdownloader/archive/%{version}/%{name}-%{version}.tar.gz
@@ -12,12 +12,15 @@ Source1: %{name}.desktop
Source2: %{name}.png
# Source2-md5: de3d0cfa08b1572878cde6e3800205fa
Source3: %{name}.sh
+Patch0: no-sphinx-deprecated.patch
+Patch1: fix-python_requires-syntax.patch
# site down, and was not in distfiles
URL: http://www.subdownloader.net/
BuildRequires: python3 >= 1:3.4
BuildRequires: python3-PyQt5
#BuildRequires: python3-PyQt5-devel-tools
BuildRequires: python3-PyQt5-uic
+BuildRequires: python3-sphinx_argparse
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.714
Requires: desktop-file-utils
@@ -57,12 +60,16 @@ Cechy:
%prep
%setup -q
+%patch -P0 -p1
+%patch -P1 -p1
%{__rm} scripts/gui/rc/images/icon32.ico
%build
%py3_build
+PYTHONPATH="$PWD" sphinx-build-3 doc build-3/doc
+
%install
rm -rf $RPM_BUILD_ROOT
%py3_install
diff --git a/fix-python_requires-syntax.patch b/fix-python_requires-syntax.patch
new file mode 100644
index 0000000..8aefe95
--- /dev/null
+++ b/fix-python_requires-syntax.patch
@@ -0,0 +1,22 @@
+From a1b5f7827ebbcad8581377a1f0c263966ec859f3 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefano at rivera.za.net>
+Date: Tue, 4 Feb 2025 20:51:25 -0400
+Subject: [PATCH] Fix python_requires syntax
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 5360faca..c9193e4f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -75,7 +75,7 @@ def get_requires(filepath):
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ ],
+- python_requires='>=3.5.*, <4',
++ python_requires='>=3.5, <4',
+ provides=[
+ 'subdownloader'
+ ],
diff --git a/no-sphinx-deprecated.patch b/no-sphinx-deprecated.patch
new file mode 100644
index 0000000..3e75b43
--- /dev/null
+++ b/no-sphinx-deprecated.patch
@@ -0,0 +1,28 @@
+--- subdownloader-2.1.0/setup.py~ 2019-10-17 23:55:08.000000000 +0200
++++ subdownloader-2.1.0/setup.py 2025-03-23 14:03:54.229982878 +0100
+@@ -8,8 +8,6 @@
+ import sys
+ from setuptools import find_packages, setup
+
+-from sphinx.setup_command import BuildDoc
+-
+ gettext.NullTranslations().install()
+
+ import subdownloader.project
+@@ -83,16 +81,4 @@
+ ],
+ },
+ include_package_data=True,
+- cmdclass={
+- 'build_sphinx': BuildDoc,
+- },
+- command_options={
+- 'build_sphinx': {
+- 'project': ('setup.py', subdownloader.project.PROJECT_TITLE, ),
+- 'version': ('setup.py', subdownloader.project.PROJECT_VERSION_STR, ),
+- 'release': ('setup.py', subdownloader.project.PROJECT_VERSION_FULL_STR, ),
+- 'builder': ('setup.py', 'man', ),
+- 'source_dir': ('setup.py', 'doc', ),
+- },
+- },
+ )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subdownloader.git/commitdiff/94849a8264e5a638fada499b6c38f805c25eb9c8
More information about the pld-cvs-commit
mailing list