Upstream hotfix

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

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,3 +1,20 @@
-/fmf-1.5.0.tar.gz
-/fmf-1.6.0.tar.gz
-/fmf-1.6.1.tar.gz
+/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-0.13.tar.gz
+/fmf-0.14.tar.gz
+/fmf-0.15.tar.gz
+/fmf-0.15.2.tar.gz
+/fmf-0.16.0.tar.gz
+/fmf-1.0.0.tar.gz
+/fmf-1.1.0.tar.gz
+/fmf-1.2.0.tar.gz
+/fmf-1.2.1.tar.gz
+/fmf-1.3.0.tar.gz
+/fmf-1.4.0.tar.gz
+/fmf-1.4.1.tar.gz

.packit.yaml

@@ -1,80 +0,0 @@
-specfile_path: fmf.spec
-files_to_sync:
-  - fmf.spec
-  - .packit.yaml
-
-upstream_package_name: fmf
-downstream_package_name: fmf
-
-# Epel9 fails to build because of too old version of setuptools_scm
-# Need to create archive with PKG-INFO
-actions:
-  create-archive:
-    - "hatch build -t sdist"
-    - "sh -c 'echo dist/fmf-*.tar.gz'"
-  get-current-version:
-    - hatch version
-
-# Common definitions
-_:
-  # Copr setup
-  - &copr
-    list_on_homepage: True
-    preserve_project: True
-    owner: "@teemtee"
-
-  # Supported targets
-  - targets: &targets
-      - fedora-all
-      - epel-9
-      - epel-10
-
-srpm_build_deps:
-  - hatch
-
-jobs:
-  # Build pull requests
-  - job: copr_build
-    trigger: pull_request
-    targets: *targets
-
-  # Test pull requests
-  - job: tests
-    trigger: pull_request
-    targets: *targets
-
-  # Build commits merged to main (copr latest)
-  - job: copr_build
-    trigger: commit
-    branch: main
-    targets: *targets
-    <<: *copr
-    project: latest
-    release_suffix: "{PACKIT_PROJECT_BRANCH}"
-
-  # Build release (copr stable)
-  - job: copr_build
-    trigger: release
-    targets: *targets
-    <<: *copr
-    project: stable
-
-  # Propose downstream pull requests
-  - job: propose_downstream
-    trigger: release
-    dist_git_branches: *targets
-
-  # Build in Koji
-  - job: koji_build
-    trigger: commit
-    allowed_pr_authors: ["packit", "all_committers"]
-    allowed_committers: ["packit", "all_committers"]
-    dist_git_branches: *targets
-
-  # Create bodhi updates
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched
-      - epel-9
-      - epel-10

README.md

@@ -1,3 +0,0 @@
-# fmf
-
-The fmf package

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.106.0.post1.dev8+g521f1e1d.

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

fmf.spec

@@ -1,22 +1,16 @@
-Name:          fmf
-Version:       1.6.1
-Release:       1%{?dist}
+Name: fmf
+Version: 1.4.1
+Release: 1%{?dist}
 
-Summary:       Flexible Metadata Format
-License:       GPL-2.0-or-later
-BuildArch:     noarch
+Summary: Flexible Metadata Format
+License: GPLv2+
+BuildArch: noarch
 
-URL:           https://github.com/teemtee/fmf
-Source:        %{pypi_source fmf}
+URL: https://github.com/psss/fmf
+Source0: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
 
 # Main fmf package requires the Python module
-BuildRequires: python3-devel
-BuildRequires: python3dist(docutils)
-BuildRequires: git-core
-Requires:      git-core
-
-Obsoletes:     python3-fmf < %{version}-%{release}
-%py_provides   python3-fmf
+Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
 
 %description
 The fmf Python module and command line tool implement a flexible
@@ -24,51 +18,65 @@ 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 command line tool.
+
+%?python_enable_dependency_generator
+
+
+%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}-ruamel-yaml
+BuildRequires: python%{python3_pkgversion}-filelock
+BuildRequires: python%{python3_pkgversion}-jsonschema
+BuildRequires: git-core
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+Requires:       git-core
+
+%description -n python%{python3_pkgversion}-%{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 3 module.
 
 
 %prep
-%autosetup -p1 -n fmf-%{version}
-
-
-%generate_buildrequires
-%pyproject_buildrequires -x tests %{?epel:-w}
+%autosetup
 
 
 %build
-%pyproject_wheel
-cp docs/header.txt man.rst
-tail -n+7 README.rst >> man.rst
-rst2man man.rst > fmf.1
+%py3_build
 
 
 %install
-%pyproject_install
-%pyproject_save_files fmf
-
+%py3_install
 mkdir -p %{buildroot}%{_mandir}/man1
 install -pm 644 fmf.1* %{buildroot}%{_mandir}/man1
 
 
 %check
-%pyproject_check_import
+%{__python3} -m pytest -vv -c tests/unit/pytest.ini -m 'not web'
 
 
-%files -f %{pyproject_files}
+%{!?_licensedir:%global license %%doc}
+
+%files
 %{_mandir}/man1/*
 %{_bindir}/%{name}
 %doc README.rst examples
+%license LICENSE
+
+%files -n python%{python3_pkgversion}-%{name}
+%{python3_sitelib}/%{name}/
+%{python3_sitelib}/%{name}-*.egg-info
+%license LICENSE
 
 
 %changelog
-* Fri Jan 17 2025 Packit <hello@packit.dev> - 1.6.1-1
-- Update to version 1.6.1
-
-* Tue Jan 07 2025 Packit <hello@packit.dev> - 1.6.0-1
-- Update to version 1.6.0
-
-* Wed Dec 04 2024 Packit <hello@packit.dev> - 1.5.0-1
-- Update to version 1.5.0
-
 * Mon Jun 17 2024 Lukáš Zachar <lzachar@redhat.com> - 1.4.1-1
 - Use local dict instead of modifying `locals()`
 

plans/main.fmf

@@ -0,0 +1,5 @@
+prepare:
+  - how: install
+    package: fmf
+execute:
+    how: tmt

plans/smoke.fmf

@@ -0,0 +1,3 @@
+summary: Minimal smoke test
+execute:
+    script: fmf --help

plans/tmt.fmf

@@ -0,0 +1,16 @@
+summary: Integration with tmt
+discover:
+    how: fmf
+    url: https://github.com/teemtee/tmt
+    ref: fedora
+    filter: tier:1
+prepare+:
+  - how: install
+    package:
+      - jq
+      - python3-pip
+      - tmt-all
+  - how: shell
+    script:
+      - pip3 install --user yq || pip3 install yq
+      - yq --help

plans/upstream.fmf

@@ -0,0 +1,5 @@
+summary: Upstream fmf tests
+discover:
+    how: fmf
+    url: https://github.com/teemtee/fmf
+    ref: fedora

sources

@@ -1 +1 @@
-SHA512 (fmf-1.6.1.tar.gz) = 5e6af03fcfe5ff74b5796fd8c0bc0fcf34f19639f16a2c8e621bc1c178cd2bf9d3212b5d8fefc77c3bbbecd3954f88e0053879cb319ad441a7a2c80aff73e784
+SHA512 (fmf-1.4.1.tar.gz) = 3ea8596bd7f678aea1aafe8e1fefecbabe96c4e9e9b67c43450594c2769b3de0768b1bd531bbd2a3d7add1d24b14c69ec3a8d2c8013e1d799b7e2ce723a3ac1f