Merge remote-tracking branch 'origin/main' into f41

This commit is contained in:
Dick Marinus 2025-12-11 21:16:46 +01:00
commit a35ceb09fb
6 changed files with 93 additions and 48 deletions

4
.gitignore vendored
View file

@ -2,6 +2,10 @@
/alot-a7075ea6226f2dfed0142529f73989961ee7b65d.tar.gz
/alot-0.6.tar.gz
/alot-0.6.tar.gz.asc
/alot-0.10
/alot-0.11
/0.7.tar.gz
/0.8.1.tar.gz
/0.10.tar.gz
/0.11.tar.gz
/v0.12.tar.gz

View file

@ -1,27 +0,0 @@
From 2f1d3760ffd3f60ba9d5563bb7985b39c229ab58 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Thu, 12 Jan 2017 16:04:48 +0100
Subject: [PATCH] don't depend on weird python-magic distribution
https://github.com/pazz/alot/issues/765#issuecomment-143228725
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
---
setup.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
index d98e6c9..1bf5033 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,6 @@ setup(
'urwid>=1.3.0',
'urwidtrees>=1.0.3',
'twisted>=18.4.0',
- 'python-magic',
'configobj>=4.7.0',
'gpg'
],
--
2.41.0

View file

@ -0,0 +1,25 @@
From 893538d39f60003489200cf166f806a4c335097d Mon Sep 17 00:00:00 2001
From: Dick Marinus <dick@mrns.nl>
Date: Sat, 6 Dec 2025 20:59:33 +0100
Subject: [PATCH] replace python-magic with file-magic
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 4a0acac6..b2ea86fa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
"urwid>=1.3.0",
"urwidtrees>=1.0.3",
"twisted>=18.4.0",
- "python-magic",
+ "file-magic",
"configobj>=4.7.0",
"gpg>1.10.0",
"standard-mailcap; python_version>'3.12'"
--
2.52.0

View file

@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.80.0.post8+gf2b5fcbc.
The file was generated using packit 0.100.2.post1.dev4+g31a74ebd.

View file

@ -1,28 +1,22 @@
Name: alot
Version: 0.10
Release: 8%{?dist}
Version: 0.12
Release: 1%{?dist}
Summary: Experimental terminal MUA based on notmuch mail
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
URL: https://github.com/pazz/alot
Source0: %{url}/archive/%{version}/%{version}.tar.gz
Patch0: 0001-don-t-depend-on-weird-python-magic-distribution.patch
Source: %{url}/archive/refs/tags/v%{version}.tar.gz
Patch: 0001-replace-python-magic-with-file-magic.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
# needed to generate manpages
BuildRequires: python3-sphinx
BuildRequires: python3-standard-mailcap
BuildRequires: make
Requires: python3-notmuch2 >= 0.27
Requires: python3-urwid >= 1.3.0
Requires: python3-urwidtrees >= 1.0
Requires: python3-twisted >= 10.2.0
Requires: python3-magic
Requires: python3-configobj >= 4.7.0
Requires: python3-gpg
BuildRequires: make
BuildRequires: procps-ng
Requires: python3-standard-mailcap
%description
@ -33,29 +27,78 @@ its display. You are responsible for automatic initial tagging.
%prep
%autosetup -p1
%generate_buildrequires
export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
%pyproject_buildrequires
%build
%py3_build
%make_build man SPHINX_BUILD=sphinx-build-3 PYTHON=python3 -C docs
export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
%pyproject_wheel
%make_build man PYTHONPATH=${PYTHONPATH}:$RPM_BUILD_DIR/alot-%{version} SPHINX_BUILD=sphinx-build-3 PYTHON=python3 -C docs
%install
%py3_install
%pyproject_install
%pyproject_save_files -l alot
install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/
install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/defaults/
%files
%check
%pyproject_check_import
%{py3_test_envvars} %{python3} -m unittest
%files -f %{pyproject_files}
%license COPYING
%doc NEWS README.md
%{python3_sitelib}/alot/
%{python3_sitelib}/alot-*.egg-info/
%{_bindir}/alot
%{_mandir}/man1/alot.1*
%{python3_sitelib}/alot/defaults
%changelog
* Sat Dec 6 2025 Dick Marinus <dick@mrns.nl> - 0.12-1
- New upstream release 0.12
* Tue Apr 22 2025 Tomas Tomecek <ttomecek@redhat.com> - 0.10-8
- depend on python3-standard-mailcap
* Tue Feb 25 2025 Tomas Tomecek <ttomecek@redhat.com> - 0.10-7
- depend on python3-notmuch2
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.11-12
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.11-11
- Rebuilt for Python 3.14.0rc2 bytecode
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.11-9
- Rebuilt for Python 3.14
* Thu May 29 2025 Dick Marinus <dick@mrns.nl> - 0.11-8
- Python 3.14 fixes
* Tue Apr 29 2025 Dick Marinus <dick@mrns.nl> - 0.11-7
- Replace python-magic with file-magic
* Mon Apr 28 2025 Dick Marinus <dick@mrns.nl> - 0.11-6
- Add unittest
* Tue Apr 15 2025 Tomas Tomecek <ttomecek@redhat.com> - 0.11-5
- Depend on python-standard-mailcap
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Nov 18 2024 Miro Hrončok <mhroncok@redhat.com> - 0.11-3
- Run import check during the build
* Thu Nov 14 2024 Tomas Tomecek <ttomecek@redhat.com> - 0.11-2
- Install defaults
* Mon Aug 26 2024 Packit <hello@packit.dev> - 0.11-1
- New upstream release 0.11
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 0.10-6
- convert license to SPDX

View file

@ -1 +1 @@
SHA512 (0.10.tar.gz) = b07c77f3a21c9670fb14a760d036ce0e14678dd6ae75585cc929f97db5126a7dbb7f411244d317fea2913692afca6ff9f439f9dbbf047acffb8fcea2ebef7056
SHA512 (v0.12.tar.gz) = 927dafd3a6f36ecd09be407384f676d9f89840c2a436e9f762627bf0073aba6a27363061257f32911f6e60a065e00b022e97799525e63568896ea07d3c2832f1