Compare commits

5 Commits

3 changed files with 23 additions and 18 deletions

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jun 9 12:40:57 UTC 2025 - Markéta Machová <mmachova@suse.com>
- Convert to libalternatives
-------------------------------------------------------------------
Mon Jun 2 12:30:05 UTC 2025 - Markéta Machová <mmachova@suse.com>
- Convert to pip-based build
-------------------------------------------------------------------
Fri May 20 06:37:52 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file
# spec file for package python-moban
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
# Tests have dependency loop with moban-ansible
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
@@ -27,9 +26,7 @@
%define pkg_suffix %{nil}
%bcond_with test
%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%bcond_without libalternatives
Name: python-moban%{pkg_suffix}
Version: 0.8.2
Release: 0
@@ -41,10 +38,14 @@ Source: https://files.pythonhosted.org/packages/source/m/moban/moban-%{v
Patch0: remove_nose.patch
Patch1: stop-using-jinja-extensions.patch
Patch2: remove-mock.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: alts
BuildRequires: fdupes
BuildRequires: git-core
BuildRequires: python-rpm-macros
Requires: alts
Requires: git-core
Requires: python-Jinja2 >= 2.7.1
Requires: python-appdirs >= 1.4.3
@@ -53,8 +54,6 @@ Requires: python-fs >= 2.4.11
Requires: python-jinja2-fsloader >= 0.2.0
Requires: python-lml >= 0.0.9
Requires: python-ruamel.yaml >= 0.15.98
Requires(post): update-alternatives
Requires(postun):update-alternatives
Suggests: python-ansible
Suggests: python-gitfs2
Suggests: python-pypifs
@@ -88,12 +87,12 @@ consistent across the documentations of individual libraries.
%if !%{with test}
%build
%python_build
%pyproject_wheel
%endif
%if !%{with test}
%install
%python_install
%pyproject_install
%python_clone -a %{buildroot}%{_bindir}/moban
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
@@ -125,18 +124,17 @@ export SKIP_TESTS
%endif
%if !%{with test}
%post
%python_install_alternative moban
%endif
%if !%{with test}
%postun
%python_uninstall_alternative moban
%pre
%python_libalternatives_reset_alternative moban
%endif
%if !%{with test}
%files %{python_files}
%{python_sitelib}/*
%{python_sitelib}/moban
%{python_sitelib}/moban-%{version}*-info
%license LICENSE
%doc README.rst CHANGELOG.rst
%python_alternative %{_bindir}/moban

View File

@@ -2311,6 +2311,3 @@ index 9f9983c4..320c5298 100644
- os.chdir(os.path.join(self.base_folder, working_directory))
+ os.chdir(fs.path.join(self.base_folder, working_directory))
run_moban_with_fs(moban_cli, None, assertions)