diff --git a/.gitignore b/.gitignore index 0c80667..bf1ccf7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,5 @@ /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 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 1f03058..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -specfile_path: alot.spec -downstream_package_name: alot -upstream_project_url: https://github.com/pazz/alot - -actions: - get-current-version: "python3 setup.py --version" - changelog-entry: bash -c "echo '- New upstream release' ${PACKIT_PROJECT_VERSION}" - -jobs: -- job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide -- job: koji_build - trigger: commit - dist_git_branches: - - fedora-rawhide diff --git a/0001-don-t-depend-on-weird-python-magic-distribution.patch b/0001-don-t-depend-on-weird-python-magic-distribution.patch new file mode 100644 index 0000000..fde3d28 --- /dev/null +++ b/0001-don-t-depend-on-weird-python-magic-distribution.patch @@ -0,0 +1,24 @@ +From 2f1d3760ffd3f60ba9d5563bb7985b39c229ab58 Mon Sep 17 00:00:00 2001 +From: Tomas Tomecek +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 +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index f20c5cb..75967b7 100755 +--- a/setup.py ++++ b/setup.py +@@ -45,7 +45,6 @@ setup( + 'urwid>=1.3.0', + 'urwidtrees>=1.0', + 'twisted>=10.2.0', +- 'python-magic', + 'configobj>=4.7.0', + 'gpg' + ], diff --git a/0001-replace-python-magic-with-file-magic.patch b/0001-replace-python-magic-with-file-magic.patch deleted file mode 100644 index e7352b2..0000000 --- a/0001-replace-python-magic-with-file-magic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 893538d39f60003489200cf166f806a4c335097d Mon Sep 17 00:00:00 2001 -From: Dick Marinus -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 - diff --git a/README.packit b/README.packit deleted file mode 100644 index 94a5d96..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.100.2.post1.dev4+g31a74ebd. diff --git a/alot.spec b/alot.spec index 2b55c88..29352ca 100644 --- a/alot.spec +++ b/alot.spec @@ -1,23 +1,25 @@ Name: alot -Version: 0.12 -Release: 2%{?dist} +Version: 0.8.1 +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 +License: GPLv3+ URL: https://github.com/pazz/alot -Source: %{url}/archive/refs/tags/v%{version}.tar.gz -Patch: 0001-replace-python-magic-with-file-magic.patch +Source0: %{url}/archive/%{version}/%{version}.tar.gz +Patch0: 0001-don-t-depend-on-weird-python-magic-distribution.patch BuildArch: noarch BuildRequires: python3-devel -# needed to generate manpages +BuildRequires: python3-setuptools BuildRequires: python3-sphinx -BuildRequires: python3-standard-mailcap -BuildRequires: make -BuildRequires: procps-ng -Requires: python3-standard-mailcap +Requires: python3-notmuch >= 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 %description alot makes use of existing solutions where possible: It does not fetch, send or @@ -27,141 +29,23 @@ its display. You are responsible for automatic initial tagging. %prep %autosetup -p1 -%generate_buildrequires -export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%pyproject_buildrequires - %build -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 +%py3_build +%make_build man SPHINX_BUILD=sphinx-build-3 PYTHON=python3 -C docs %install -%pyproject_install -%pyproject_save_files -l alot +%py3_install install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ -install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/defaults/ -%check -%pyproject_check_import -%{py3_test_envvars} %{python3} -m unittest - -%files -f %{pyproject_files} +%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 -* Fri Jan 16 2026 Fedora Release Engineering - 0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Sat Dec 6 2025 Dick Marinus - 0.12-1 -- New upstream release 0.12 - -* Fri Sep 19 2025 Python Maint - 0.11-12 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 0.11-11 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Wed Jul 23 2025 Fedora Release Engineering - 0.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 0.11-9 -- Rebuilt for Python 3.14 - -* Thu May 29 2025 Dick Marinus - 0.11-8 -- Python 3.14 fixes - -* Tue Apr 29 2025 Dick Marinus - 0.11-7 -- Replace python-magic with file-magic - -* Mon Apr 28 2025 Dick Marinus - 0.11-6 -- Add unittest - -* Tue Apr 15 2025 Tomas Tomecek - 0.11-5 -- Depend on python-standard-mailcap - -* Thu Jan 16 2025 Fedora Release Engineering - 0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Nov 18 2024 Miro Hrončok - 0.11-3 -- Run import check during the build - -* Thu Nov 14 2024 Tomas Tomecek - 0.11-2 -- Install defaults - -* Mon Aug 26 2024 Packit - 0.11-1 -- New upstream release 0.11 - -* Thu Jul 25 2024 Miroslav Suchý - 0.10-6 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 0.10-4 -- Rebuilt for Python 3.13 - -* Mon Jan 22 2024 Fedora Release Engineering - 0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 14 2023 Packit - 0.10-1 -- New upstream release 0.10 - -* Wed Jul 19 2023 Fedora Release Engineering - 0.8.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 14 2023 Python Maint - 0.8.1-16 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 0.8.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 0.8.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 0.8.1-13 -- Rebuilt for Python 3.11 - -* Wed Jan 19 2022 Fedora Release Engineering - 0.8.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.8.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.8.1-10 -- Rebuilt for Python 3.10 - -* Mon Jan 25 2021 Fedora Release Engineering - 0.8.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.8.1-7 -- Rebuilt for Python 3.9 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 0.8.1-5 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 0.8.1-4 -- Rebuilt for Python 3.8 - -* Mon Aug 19 2019 Miro Hrončok - 0.8.1-3 -- Rebuilt for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Mon May 27 2019 Tomas Tomecek - 0.8.1-1 - Update to 0.8.1 - s/python 2/python 3/ diff --git a/sources b/sources index 352201f..9991a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.12.tar.gz) = 927dafd3a6f36ecd09be407384f676d9f89840c2a436e9f762627bf0073aba6a27363061257f32911f6e60a065e00b022e97799525e63568896ea07d3c2832f1 +SHA512 (0.8.1.tar.gz) = bca4a01636594f0e71c6ea260d74cf26e74dfd7aca1ea7801714b4aaf9602ae7737769e77e3af0363ed2701df1494e0f87ce85b58c47a6380ad1a9098f8501d4