Skip to content

Commit 964ee99

Browse files
committed
Merge fmf and python3-fmf packages
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
1 parent c652542 commit 964ee99

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

fmf.spec

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ Source: %{pypi_source fmf}
1313
BuildRequires: python3-devel
1414
BuildRequires: python3dist(docutils)
1515
BuildRequires: git-core
16-
Requires: python3-fmf == %{version}-%{release}
16+
Requires: git-core
17+
18+
# fmf and python3-fmf packages were merged in 1.4.0
19+
Obsoletes: python3-fmf < 1.4.0
20+
%py_provides python3-fmf
1721

1822
%description
1923
The fmf Python module and command line tool implement a flexible
@@ -24,19 +28,6 @@ efficient way to organize data into well-sized text documents.
2428
This package contains the command line tool.
2529

2630

27-
%package -n python3-fmf
28-
Summary: %{summary}
29-
Requires: git-core
30-
31-
%description -n python3-fmf
32-
The fmf Python module and command line tool implement a flexible
33-
format for defining metadata in plain text files which can be
34-
stored close to the source code. Thanks to hierarchical structure
35-
with support for inheritance and elasticity it provides an
36-
efficient way to organize data into well-sized text documents.
37-
This package contains the Python 3 module.
38-
39-
4031
%prep
4132
%autosetup -p1 -n fmf-%{version}
4233

@@ -64,18 +55,14 @@ install -pm 644 fmf.1* %{buildroot}%{_mandir}/man1
6455
%pytest -vv -m 'not web'
6556

6657

67-
%files
58+
%files -f %{pyproject_files}
6859
%{_mandir}/man1/*
6960
%{_bindir}/%{name}
7061
%doc README.rst examples
71-
%license LICENSE
72-
73-
%files -n python3-fmf -f %{pyproject_files}
7462
# Epel9 does not tag the license file in pyproject_files as a license. Manually install it in this case
7563
%if 0%{?el9}
7664
%license LICENSE
7765
%endif
78-
%doc README.rst
7966

8067

8168
%changelog

0 commit comments

Comments
 (0)