Import fmf-0.10

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,3 +1,6 @@
 /fmf-0.4.tar.gz
 /fmf-0.5.tar.gz
 /fmf-0.6.tar.gz
+/fmf-0.7.tar.gz
+/fmf-0.8.tar.gz
+/fmf-0.10.tar.gz

fmf.spec

@@ -1,5 +1,5 @@
 Name: fmf
-Version: 0.6
+Version: 0.10
 Release: 1%{?dist}
 
 Summary: Flexible Metadata Format
@@ -7,43 +7,25 @@ License: GPLv2+
 BuildArch: noarch
 
 URL: https://github.com/psss/fmf
-Source: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
-
+Source0: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
 
 # Depending on the distro, we set some defaults.
 # Note that the bcond macros are named for the CLI option they create.
 # "%%bcond_without" means "ENABLE by default and create a --without option"
 
-# Fedora (py3 executable, py2 & py3 subpackage, auto build requires)
-%if 0%{?fedora}
-%bcond_without python2
-%bcond_without python3
-%bcond_with py2executable
+# Fedora or RHEL 8+
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with oldreqs
-
-# RHEL6 and RHEL7 (py2 executable, py2 subpackage, manual build requires)
+%bcond_with englocale
 %else
-%if 0%{?rhel} <= 7
-%bcond_without python2
-%bcond_with python3
-%bcond_without py2executable
+# The automatic runtime dependency generator doesn't exist yet
 %bcond_without oldreqs
-
-# RHEL8+ (py3 executable, py3 subpackage, auto build requires)
-%else
-%bcond_with python2
-%bcond_without python3
-%bcond_with py2executable
-%bcond_with oldreqs
-%endif
+# The C.UTF-8 locale doesn't exist, Python defaults to C (ASCII)
+%bcond_without englocale
 %endif
 
-# Main fmf package requires corresponding python module
-%if %{with py2executable}
-Requires: python2-%{name} == %{version}-%{release}
-%else
+# Main tmt package requires the Python module
 Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
-%endif
 
 %description
 The fmf Python module and command line tool implement a flexible
@@ -56,36 +38,6 @@ This package contains the command line tool.
 %?python_enable_dependency_generator
 
 
-# Python 2
-%if %{with python2}
-%package -n     python2-%{name}
-Summary:        %{summary}
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-%if %{with oldreqs}
-BuildRequires: pytest
-BuildRequires: PyYAML
-%else
-BuildRequires: python2dist(pytest)
-BuildRequires: python2dist(pyyaml)
-%endif
-%{?python_provide:%python_provide python2-%{name}}
-%if %{with oldreqs}
-Requires:       PyYAML
-%endif
-
-%description -n python2-%{name}
-The fmf Python module and command line tool implement a flexible
-format for defining metadata in plain text files which can be
-stored close to the source code. Thanks to hierarchical structure
-with support for inheritance and elasticity it provides an
-efficient way to organize data into well-sized text documents.
-This package contains the Python 2 module.
-%endif
-
-
-# Python 3
-%if %{with python3}
 %package -n     python%{python3_pkgversion}-%{name}
 Summary:        %{summary}
 BuildRequires: python%{python3_pkgversion}-devel
@@ -104,81 +56,86 @@ stored close to the source code. Thanks to hierarchical structure
 with support for inheritance and elasticity it provides an
 efficient way to organize data into well-sized text documents.
 This package contains the Python 3 module.
-%endif
 
 
 %prep
-%setup -q
+%autosetup
 
 
 %build
-export LANG=en_US.utf-8 # for Python <= 3.6 and EPEL <= 7, but harmless
+%if %{with englocale}
+export LANG=en_US.utf-8
+%endif
 
-%if %{with python2}
-%py2_build
-%endif
-%if %{with python3}
 %py3_build
-%endif
 
 
 %install
+%if %{with englocale}
 export LANG=en_US.utf-8
-
-%if %{with python2}
-%py2_install
 %endif
 
-%if %{with python3}
 %py3_install
-%endif
-
-%if %{with py2executable} && %{with python3}
-rm -f %{buildroot}%{_bindir}/*
-%py2_install
-%endif
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -pm 644 fmf.1* %{buildroot}%{_mandir}/man1
 
 
 %check
+%if %{with englocale}
 export LANG=en_US.utf-8
-
-%if %{with python2}
-%{__python2} -m pytest -vv
 %endif
 
-%if %{with python3}
 %{__python3} -m pytest -vv
-%endif
 
 
 %{!?_licensedir:%global license %%doc}
 
-
 %files
 %{_mandir}/man1/*
 %{_bindir}/%{name}
 %doc README.rst examples
 %license LICENSE
 
-%if %{with python2}
-%files -n python2-%{name}
-%{python2_sitelib}/%{name}/
-%{python2_sitelib}/%{name}-*.egg-info
-%license LICENSE
-%endif
-
-%if %{with python3}
 %files -n python%{python3_pkgversion}-%{name}
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/%{name}-*.egg-info
 %license LICENSE
-%endif
 
 
 %changelog
+* Wed Oct 30 2019 Petr Šplíchal <psplicha@redhat.com> - 0.10-1
+- Mock is not needed for docs, fix missing new line
+- Provide a public static method Tree.init()
+
+* Wed Oct 09 2019 Petr Šplíchal <psplicha@redhat.com> - 0.9-1
+- Support custom conjunction like 'or' in listed()
+- Update smoke testset to the latest L2 spec
+- Fix build conditional default for englocale
+- Use raw strings for regular expression patterns
+
+* Mon Sep 30 2019 Petr Šplíchal <psplicha@redhat.com> - 0.8-1
+- Update spec to build Python 3 packages only
+- Move unit tests into a separate directory
+- Move testsets, include a super simple smoke test
+- Initial set of stories and tests
+- Enable beakerlib smoke test in the testing farm
+- Add a simple beakerlib test for command line help
+- Clean up the docs build folder directly
+- Enable packit
+
+* Fri Jul 26 2019 Petr Šplíchal <psplicha@redhat.com> - 0.7-1
+- Support both old and new yaml loader
+- Add advanced python filtering [fix #55]
+- Drop explicit locale setting during build and install
+- Drop Python 2 subpackage on Fedora 30+ (#1647798)
+- Better handle yaml errors [fix #50]
+- Support reducing attributes using the "-" suffix
+- Prevent extra new lines in the show() output
+- Adjust FullLoader to load all strings as unicode
+- Suppress yaml warnings by specifying the loader
+- Support Tree.find() for non-leaf nodes as well
+
 * Mon Oct 08 2018 Petr Šplíchal <psplicha@redhat.com> 0.6-1
 - Ignore directories with no metadata defined
 - Give a nice error when .fmf file exists [fix #37]

sources

@@ -1 +1 @@
-SHA512 (fmf-0.6.tar.gz) = 92ed3a15f9c7511e1702e41df6ccbc805c8a0428938ef064acd76f60fb60da71e424c811d1a1dc67922e2b02913a68516cd8b95c8f9b17cf821e3fca47ba4a7c
+SHA512 (fmf-0.10.tar.gz) = e42663abee21ed7a59f8d216e4e554a6517a57b883d85b87f44910a96bf25c29d2b3b8132b8e18340656fa2f0e956432687e08f8548d39e7e88b1746223a9d29