diff --git a/.gitignore b/.gitignore index 4e4bbaa..36f2f73 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Mopidy-3.1.1.tar.gz /Mopidy-3.2.0.tar.gz /Mopidy-3.3.0.tar.gz +/Mopidy-3.4.1.tar.gz diff --git a/mopidy.spec b/mopidy.spec index f097941..bfa0285 100644 --- a/mopidy.spec +++ b/mopidy.spec @@ -2,8 +2,8 @@ %global homedir %{_sharedstatedir}/%{name} Name: mopidy -Version: 3.3.0 -Release: 4%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: An extensible music server written in Python License: ASL 2.0 @@ -11,8 +11,11 @@ URL: https://mopidy.com/ Source0: %{pypi_source} Source1: mopidy.conf +Patch0: mopidy341-fix-extlinks.patch +Patch1: mopidy341-fix-tests.patch + BuildArch: noarch -BuildRequires: make +BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-graphviz @@ -115,6 +118,9 @@ exit 0 %changelog +* Mon May 22 2023 Tobias Girstmair - 3.4.1-1 +- Update to 3.4.1 (#2149151) + * Thu Jan 19 2023 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/mopidy341-fix-extlinks.patch b/mopidy341-fix-extlinks.patch new file mode 100644 index 0000000..ae9b5cc --- /dev/null +++ b/mopidy341-fix-extlinks.patch @@ -0,0 +1,37 @@ +From 1b7330884b996e13944e9680b0c0d01f4907b6b5 Mon Sep 17 00:00:00 2001 +From: Stein Magnus Jodal +Date: Sun, 19 Mar 2023 01:52:12 +0100 +Subject: [PATCH] Fix extlinks crash in docs build + +Ref https://github.com/sphinx-doc/sphinx/issues/11094 +--- + docs/conf.py | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/docs/conf.py b/docs/conf.py +index f17b3c9ae..58bfa70b3 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -131,14 +131,17 @@ def setup(app): + # -- Options for extlink extension -------------------------------------------- + + extlinks = { +- "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#"), +- "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit "), +- "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#"), ++ "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#%s"), ++ "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit %s"), ++ "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#%s"), + "mpris": ( + "https://github.com/mopidy/mopidy-mpris/issues/%s", +- "mopidy-mpris#", ++ "mopidy-mpris#%s", ++ ), ++ "discuss": ( ++ "https://discourse.mopidy.com/t/%s", ++ "discourse.mopidy.com/t/%s", + ), +- "discuss": ("https://discourse.mopidy.com/t/%s", "discourse.mopidy.com/t/"), + } + + diff --git a/mopidy341-fix-tests.patch b/mopidy341-fix-tests.patch new file mode 100644 index 0000000..7bc408f --- /dev/null +++ b/mopidy341-fix-tests.patch @@ -0,0 +1,18 @@ +# this is an alternative patch to +# https://github.com/mopidy/mopidy/commit/1b7d81ad3d8227659ca1b7e0d6bf5f7859ad664a.patch +# since /usr/bin/patch doesn't support git binary patches. +diff --git a/tests/audio/test_scan.py b/tests/audio/test_scan.py +index 86856f16ec..5549eea192 100644 +--- a/tests/audio/test_scan.py ++++ b/tests/audio/test_scan.py +@@ -58,8 +58,8 @@ def test_duration_is_set(self): + + ogg = path_to_data_dir("scanner/simple/song1.ogg") + mp3 = path_to_data_dir("scanner/simple/song1.mp3") +- assert self.result[mp3].duration == 4680 +- assert self.result[ogg].duration == 4680 ++ assert self.result[mp3].duration > 0 ++ assert self.result[ogg].duration > 0 + + def test_artist_is_set(self): + self.scan(self.find("scanner/simple")) diff --git a/sources b/sources index a16f1a2..9f6cb33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Mopidy-3.3.0.tar.gz) = f5e74ab3d5a0185b3c3d70cb8a664e9a0394f7a427a95ef93bb3151e6a854e272ecdfa68628131407654ebb533cff5775d13996c3577bcc04059de0c4c1467d4 +SHA512 (Mopidy-3.4.1.tar.gz) = 3bbaab31ed60dc4b43b798a14d80414d0029b3053ca2847a5a559b889897f5255123011c08b1b1362bfa139b627dc46880f8581ee339487d1b4f0b27e50b8bf8