public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/beets] rawhide: rhbz#2508496
@ 2026-07-29 21:37 Gerald B Cox
  0 siblings, 0 replies; only message in thread
From: Gerald B Cox @ 2026-07-29 21:37 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/beets
Branch : rawhide
Commit : bcbb917db56f7284800e53de8cf2158eac1d65b1
Author : Gerald B Cox <gbcox@fedoraproject.org>
Date   : 2026-07-29T14:36:55-07:00
Stats  : +16/-71 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/beets/c/bcbb917db56f7284800e53de8cf2158eac1d65b1?branch=rawhide

Log:
rhbz#2508496

---
diff --git a/.gitignore b/.gitignore
index 6110055..f80595d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /beets-2.10.0.tar.gz
 /beets-2.11.0.tar.gz
 /beets-2.12.0.tar.gz
+/beets-2.13.1.tar.gz

diff --git a/allow-python3.15-build.patch b/allow-python3.15-build.patch
index 576a3be..631b3e5 100644
--- a/allow-python3.15-build.patch
+++ b/allow-python3.15-build.patch
@@ -1,25 +1,12 @@
-From f17bb0978a11f2a552a183843335a085f66aeb61 Mon Sep 17 00:00:00 2001
-From: Karolina Surma <ksurma@redhat.com>
-Date: Mon, 4 May 2026 10:35:44 +0200
-Subject: [PATCH] Allow building with Python 3.15
-
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/pyproject.toml b/pyproject.toml
-index c1cbf76..f8b9677 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -42,7 +42,7 @@ Changelog = "https://github.com/beetbox/beets/blob/master/docs/changelog.rst"
- "Bug Tracker" = "https://github.com/beetbox/beets/issues"
- 
- [tool.poetry.dependencies]
--python = ">=3.10,<3.15"
-+python = ">=3.10"
- 
- colorama = { version = "*", markers = "sys_platform == 'win32'" }
- confuse = ">=2.2.0"
--- 
-2.54.0
-
+@@ -5,7 +5,7 @@ authors = [{ name = "Adrian Sampson", email = "adrian@radbox.org" }]
+ maintainers = [{ name = "Serene-Arc" }]
+ license = { text = "MIT" }
+ readme = "README.rst"
+-requires-python = ">=3.10,<3.15"
++requires-python = ">=3.10,<3.16"
+ classifiers = [
+     "Topic :: Multimedia :: Sound/Audio",
+     "Topic :: Multimedia :: Sound/Audio :: Players :: MP3",

diff --git a/beets.spec b/beets.spec
index 72bf35c..1e3d714 100644
--- a/beets.spec
+++ b/beets.spec
@@ -1,5 +1,5 @@
 Name:           beets
-Version:        2.12.0
+Version:        2.13.1
 Release:        %autorelease
 Summary:        Music library manager and MusicBrainz tagger
 License:        MIT and ISC
@@ -8,17 +8,8 @@ Source0:        %{pypi_source beets}
 
 Patch:          allow-python3.15-build.patch
 
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-pydata-sphinx-theme
-BuildRequires:  python3dist(poetry-core) >= 1
 BuildRequires:  python-requests-ratelimiter
 
-# Sphinx extras used by upstream docs
-BuildRequires:  python3dist(sphinxcontrib-htmlhelp)
-BuildRequires:  python3dist(sphinxcontrib-serializinghtml)
-BuildRequires:  python-sphinx-design
-BuildRequires:  python-sphinx-copybutton
-
 # Tests
 BuildRequires:  python3-jellyfish
 BuildRequires:  gstreamer1-plugins-good
@@ -26,8 +17,6 @@ BuildRequires:  python3-responses
 BuildRequires:  pytest
 BuildRequires:  python3-pytest-timeout
 
-
-BuildRequires:  make
 BuildArch:      noarch
 
 Requires:       python-packaging
@@ -54,40 +43,16 @@ imagine for your music collection. Via plugins, beets becomes a panacea:
 - Browse your music library graphically through a Web browser and play it in
   any browser that supports HTML5 Audio.
 
-%package doc
-Summary:        Documentation for beets
-
-%description doc
-The beets-doc package provides useful information on the
-beets Music Library Manager. Documentation is shipped in
-both text and html formats.
-
 %prep
 # Tarball has wrong basedir https://github.com/beetbox/beets/issues/5284
 %autosetup -p1 -n beets-%{version}
 
-# Drop optional sphinx_toolbox extension (not packaged in Fedora)
-sed -i '/sphinx_toolbox/d' docs/conf.py
-
-# Temporarily relax mediafile requirement
-sed -i 's/^mediafile = ">=0\.16\.2"$/mediafile = ">=0.12.0"/' pyproject.toml
-
-echo "==== mediafile dependency after patch ===="
-grep -n '^mediafile' pyproject.toml
-echo "========================================="
-
 %generate_buildrequires
 %pyproject_buildrequires -r
 
 %build
 %pyproject_wheel
 
-pushd docs
-env PYTHONPATH=.. sphinx-build-3 -b man  -d _build/doctrees . _build/man
-env PYTHONPATH=.. sphinx-build-3 -b html -d _build/doctrees . _build/html
-env PYTHONPATH=.. sphinx-build-3 -b text -d _build/doctrees . _build/text
-popd
-
 %check
 PYTHONPATH=. python3 - <<'PY'
 import beets
@@ -101,20 +66,16 @@ PY
   --deselect test/test_importer.py::ImportTest::test_skip_non_album_dirs \
   --ignore test/plugins
 
-
 %install
 %pyproject_install
 %pyproject_save_files -l beets beetsplug -L
-install -Dm0644 docs/_build/man/beet.1 \
+
+# Manpages are pre-generated and included in the upstream sdist since 2.13.1.
+install -Dm0644 man/beet.1 \
   %{buildroot}%{_mandir}/man1/beet.1
-install -Dm0644 docs/_build/man/beetsconfig.5 \
+install -Dm0644 man/beetsconfig.5 \
   %{buildroot}%{_mandir}/man5/beetsconfig.5
 
-# Copy only HTML docs
-mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -a docs/_build/html %{buildroot}%{_docdir}/%{name}/html
-rm -f %{buildroot}%{_docdir}/%{name}/html/.buildinfo
-
 %files -n beets -f %{pyproject_files}
 %{_bindir}/beet
 %{_mandir}/man1/beet.1*
@@ -122,8 +83,4 @@ rm -f %{buildroot}%{_docdir}/%{name}/html/.buildinfo
 %license LICENSE
 %doc README.rst
 
-%files doc
-%doc %{_docdir}/%{name}/html
-%license LICENSE
-
 %autochangelog

diff --git a/sources b/sources
index 9379201..cd07f5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (beets-2.12.0.tar.gz) = ab069c6494925442b63b62c3530a122cdf1ba54281e086791f32699e91a59c3b81cfbe4687cbb28a70c6d47ae7889cf940461198247c4f52ba07287960319480
+SHA512 (beets-2.13.1.tar.gz) = 3a3eaeb16f061ede4648da1b1df9324ec9c7ec026e2ab8f59fcc19521c8715b4c98eb1ea04aa91c654ef10183f8053a41d4f5b7c72dec641bffa2dc979efc1d6

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-29 21:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-29 21:37 [rpms/beets] rawhide: rhbz#2508496 Gerald B Cox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox