Release fmf-0.12

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

.gitignore

@@ -1,3 +1,8 @@
 /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-0.11.tar.gz
+/fmf-0.12.tar.gz

fmf.spec

@@ -1,5 +1,5 @@
 Name: fmf
-Version: 0.6
+Version: 0.12
 Release: 1%{?dist}
 
 Summary: Flexible Metadata Format
@@ -7,43 +7,28 @@ 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
-%bcond_with oldreqs
-
-# RHEL6 and RHEL7 (py2 executable, py2 subpackage, manual build requires)
-%else
-%if 0%{?rhel} <= 7
-%bcond_without python2
-%bcond_with python3
-%bcond_without py2executable
-%bcond_without oldreqs
-
-# RHEL8+ (py3 executable, py3 subpackage, auto build requires)
-%else
+# Fedora or RHEL 8+
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with python2
-%bcond_without python3
-%bcond_with py2executable
 %bcond_with oldreqs
-%endif
+%bcond_with englocale
+# RHEL 7
+%else
+%bcond_without python2
+# The automatic runtime dependency generator doesn't exist yet
+%bcond_without oldreqs
+# 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
@@ -62,17 +47,10 @@ This package contains the command line tool.
 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
@@ -85,13 +63,13 @@ This package contains the Python 2 module.
 
 
 # Python 3
-%if %{with python3}
 %package -n     python%{python3_pkgversion}-%{name}
 Summary:        %{summary}
 BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: python%{python3_pkgversion}-setuptools
 BuildRequires: python%{python3_pkgversion}-pytest
 BuildRequires: python%{python3_pkgversion}-PyYAML
+BuildRequires: git-core
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 %if %{with oldreqs}
 Requires:       python%{python3_pkgversion}-PyYAML
@@ -104,59 +82,53 @@ 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
+%endif
 
 %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
+%endif
 
 %if %{with python2}
-%{__python2} -m pytest -vv
+%{__python2} -m pytest -vv -m 'not web'
 %endif
 
-%if %{with python3}
-%{__python3} -m pytest -vv
-%endif
+%{__python3} -m pytest -vv -m 'not web'
 
 
 %{!?_licensedir:%global license %%doc}
 
-
 %files
 %{_mandir}/man1/*
 %{_bindir}/%{name}
@@ -170,15 +142,64 @@ export LANG=en_US.utf-8
 %license LICENSE
 %endif
 
-%if %{with python3}
 %files -n python%{python3_pkgversion}-%{name}
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/%{name}-*.egg-info
 %license LICENSE
-%endif
 
 
 %changelog
+* Thu Jun 04 2020 Petr Šplíchal <psplicha@redhat.com> - 0.12-1
+- Do git pull in utils.fetch
+- Make fetch._run official as utils.run
+
+* Tue Mar 17 2020 Petr Šplíchal <psplicha@redhat.com> - 0.11-2
+- Enable back python2-fmf subpackage for RHEL7
+
+* Fri Feb 14 2020 Petr Šplíchal <psplicha@redhat.com> - 0.11-1
+- Add git to BuildRequires (now required by tests)
+- Use coveralls to report coverage results
+- Adjust Tree.node() implementation, extend tests
+- Get metadata for unique id [fix #67]
+- Use the fedora-all target in packit config (#72)
+- Define the full fmf identifier [fix #52]
+- A minor cleanup of the concept documentation
+- Always ignore special system directories
+- Filesystem root and inaccessible dirs [fix #70]
+- Rename the 'testsets' directory to 'plans'
+
+* 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.12.tar.gz) = adacfaac4a2bfad316d7f231f66935fc9dc9b1ac52b685cec35e082d81cb5d5cf5c02a644e29215f7a35b98b6a14f17d0f830fd3c234f8665592babb6578efbb