disable fish zsh

tomcli has recently appeared as a potential build dependency for ELN
packages. It is unclear at this point whether tomcli will end up as a
required dependency for RHEL 11, but if it does, it will likely be with
minimal dependencies.  tomli-w is already in RHEL, but tomlkit is not, nor
is scdoc for the manpages.  If it ends up in EPEL instead (as it may
already for 10), then the extra dependencies are not a concern.

Also, some fixes are needed when manpages are disabled.

sources

@@ -1,2 +1,2 @@
-SHA512 (tomcli-0.3.0.tar.gz) = 1fb1f89828971d07972a5f55c42335f1f0a8c78686616a1310ba9bc722fc3b6650ed8019ef91941e21c781b74b723ca9107f6e1b7e61639de6660897f841e5bd
-SHA512 (tomcli-0.3.0.tar.gz.asc) = c4aef343865fa396b2e6d5f8ad93207abeaed0426024e7513d286cdab553afa0bd0b274f85b288b4e02852ab0daf2e7c7fade81485077d5c6415a62fdbeb3831
+SHA512 (tomcli-0.10.1.tar.gz) = 5e41665f74cae42feab53b23268a5ff9bcc77a32e7ea6a23e8b5758495aad304e5addf3f82b5e9d6553221db6788d0bf378eccb1908d40a375ba34b8a9565b95
+SHA512 (tomcli-0.10.1.tar.gz.asc) = 138230ab12d1f32978752b4aa1547bb13b30536a6868bad2c64bbbe610e55f012f87bb1be65e0ed1ffbf0ce07b4b162dcb54dedd1c5ee3cb667e6f8992d5e085

tomcli.spec

@@ -4,9 +4,34 @@
 # SPDX-License-Identifier: MIT
 # License text: https://spdx.org/licenses/MIT.html
 
+# bconds:
+#   tests
+#       Run unit tests
+#   tomlkit
+#       Enable tomlkit and all extras
+#   manpages
+#       Build manpages using scdoc
+#   bootstrap
+#       Disable tomlkit dependencies and unit tests.
+#       Add ~bootstrap to %%dist
+#       Allows tomcli to be built early in the new Python bootstrap process.
+
+%bcond bootstrap 0
+%bcond tomlkit %[%{without bootstrap} && (%{undefined rhel} || %{defined epel})]
+%bcond tests %{without bootstrap}
+%bcond manpages %[%{undefined rhel} || %{defined epel}]
+
+# Add minimal py3_test_envvars for EPEL 9
+%if %{undefined py3_test_envvars}
+%define py3_test_envvars %{shrink:
+PYTHONPATH=%{buildroot}%{python3_sitelib}
+PATH=%{buildroot}%{_bindir}:${PATH}
+}
+%endif
+
 Name:           tomcli
-Version:        0.3.0
-Release:        1%{?dist}
+Version:        0.10.1
+Release:        4%{?dist}
 Summary:        CLI for working with TOML files. Pronounced "tom clee."
 
 License:        MIT
@@ -14,19 +39,21 @@ URL:            https://sr.ht/~gotmax23/tomcli
 %global furl    https://git.sr.ht/~gotmax23/tomcli
 Source0:        %{furl}/refs/download/v%{version}/tomcli-%{version}.tar.gz
 Source1:        %{furl}/refs/download/v%{version}/tomcli-%{version}.tar.gz.asc
-Source2:        https://meta.sr.ht/~gotmax23.pgp
 
 BuildArch:      noarch
-BuildRequires:  gnupg2
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist pytest}
+%if %{with manpages}
+BuildRequires:  scdoc
+%endif
 
 # One of the TOML backends is required
 Requires:       (%{py3_dist tomcli[tomlkit]} or %{py3_dist tomcli[tomli]})
+%if %{with tomlkit}
 # Prefer the tomlkit backend
 Suggests:       %{py3_dist tomcli[tomlkit]}
 # Recommend the 'all' extra
 Recommends:     %{py3_dist tomcli[all]}
+%endif
 
 
 %description
@@ -34,58 +61,132 @@ tomcli is a CLI for working with TOML files. Pronounced "tom clee."
 
 
 %prep
-%gpgverify -d0 -s1 -k2
 %autosetup -p1
 
 
 %generate_buildrequires
-%pyproject_buildrequires -x all,tomlkit,tomli,test %{?el9:-w}
+%{pyproject_buildrequires %{shrink:
+    -x tomli
+    %{?with_tomlkit:-x all,tomlkit}
+    %{?with_tests:-x test}
+}}
 
 
 %build
 %pyproject_wheel
 
+%if %{with manpages}
+for page in doc/*.scd; do
+    dest="${page%.scd}"
+    scdoc <"${page}" >"${dest}"
+done
+%endif
+
 
 %install
 %pyproject_install
 %pyproject_save_files tomcli
 
-mkdir -p %{buildroot}%{bash_completions_dir}
-mkdir -p %{buildroot}%{fish_completions_dir}
-mkdir -p %{buildroot}%{zsh_completions_dir}
+%if %{with manpages}
+# Install manpages
+install -Dpm 0644 doc/*.1 -t %{buildroot}%{_mandir}/man1
+%endif
 
+# Install shell completions
 (
-export PYTHONPATH="%{buildroot}%{python3_sitelib}"
-export _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=1
-for command in %{buildroot}%{_bindir}/tomcli*; do
-    $command --show-completion=bash > "%{buildroot}%{bash_completions_dir}/$(basename $command)"
-    $command --show-completion=fish > "%{buildroot}%{fish_completions_dir}/$(basename $command).fish"
-    $command --show-completion=zsh > "%{buildroot}%{zsh_completions_dir}/_$(basename $command)"
-done
+export %{py3_test_envvars}
+%{python3} compgen.py \
+    --installroot %{buildroot} \
+    --bash-dir %{bash_completions_dir}
 )
 
 
 %check
+# Smoke test
+(
+export %{py3_test_envvars}
+TOMCLI="%{buildroot}%{_bindir}/tomcli"
+cp pyproject.toml test.toml
+name="$($TOMCLI get test.toml project.name)"
+test "${name}" = "tomcli"
+
+$TOMCLI set test.toml str project.name not-tomcli
+newname="$($TOMCLI get test.toml project.name)"
+test "${newname}" = "not-tomcli"
+)
+
+%pyproject_check_import
+%if %{with tests}
 %pytest
+%endif
 
 
-%pyproject_extras_subpkg -n tomcli all tomli tomlkit
+%pyproject_extras_subpkg -n tomcli %{?with_tomlkit:all tomlkit} tomli
 
 
 %files -f %{pyproject_files}
-# I prefer not to rely on %%pyproject_save_files to mark files with %%license.
-# Also, Fedora's hatchling supports the current draft of PEP 639, but EPEL 9's
-# does not.
-%license LICENSES/*.txt
+%license LICENSE
 %doc README.md
 %doc NEWS.md
 %{_bindir}/tomcli*
 %{bash_completions_dir}/tomcli*
-%{fish_completions_dir}/tomcli*.fish
-%{zsh_completions_dir}/_tomcli*
+%if %{with manpages}
+%{_mandir}/man1/tomcli*.1*
+%endif
 
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.10.1-3
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.10.1-2
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Thu Jul 31 2025 Maxwell G <maxwell@gtmx.me> - 0.10.1-1
+- Update to 0.10.1.
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jun 06 2025 Maxwell G <maxwell@gtmx.me> - 0.10.0-1
+- Update to 0.10.0.
+
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.9.0-2
+- Rebuilt for Python 3.14
+
+* Sun Mar 02 2025 Maxwell G <maxwell@gtmx.me> - 0.9.0-1
+- Update to 0.9.0.
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Sep 16 2024 Maxwell G <maxwell@gtmx.me> - 0.8.0-1
+- Update to 0.8.0.
+
+* Wed Aug 28 2024 Maxwell G <maxwell@gtmx.me> - 0.7.0-1
+- Update to 0.7.0.
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.6.0-2
+- Rebuilt for Python 3.13
+
+* Thu Mar 28 2024 Maxwell G <maxwell@gtmx.me> - 0.6.0-1
+- Update to 0.6.0.
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 22 2023 Maxwell G <maxwell@gtmx.me> - 0.5.0-2
+- Fix installation of license files
+
+* Thu Dec 14 2023 Maxwell G <maxwell@gtmx.me> - 0.5.0-1
+- Update to 0.5.0.
+
 * Thu Sep 07 2023 Maxwell G <maxwell@gtmx.me> - 0.3.0-1
 - Update to 0.3.0.