From 5bf696d1137ed98acf3a31c69c726e090a07833b Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <isidentical@gmail.com>
Date: Tue, 30 Nov 2021 13:49:38 +0300
Subject: [PATCH] Fix packit CI (#1219)

---
 .packit.yaml                                | 3 ++-
 docs/packaging/linux-fedora/httpie.spec.txt | 3 +++
 httpie/manager/plugins.py                   | 4 +---
 setup.py                                    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.packit.yaml b/.packit.yaml
index 4dfdb1a5..8fc33379 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -3,7 +3,8 @@
 specfile_path: httpie.spec
 actions:
   # get the current Fedora Rawhide specfile:
-  post-upstream-clone: "wget https://src.fedoraproject.org/rpms/httpie/raw/rawhide/f/httpie.spec -O httpie.spec"
+  # post-upstream-clone: "wget https://src.fedoraproject.org/rpms/httpie/raw/rawhide/f/httpie.spec -O httpie.spec"
+  post-upstream-clone: "cp docs/packaging/linux-fedora/httpie.spec.txt httpie.spec"
 jobs:
 - job: copr_build
   trigger: pull_request
diff --git a/docs/packaging/linux-fedora/httpie.spec.txt b/docs/packaging/linux-fedora/httpie.spec.txt
index 8dc4e6b3..b0ab5b7b 100644
--- a/docs/packaging/linux-fedora/httpie.spec.txt
+++ b/docs/packaging/linux-fedora/httpie.spec.txt
@@ -56,6 +56,7 @@ export PYTHONPATH=%{buildroot}%{python3_sitelib}
 mkdir -p %{buildroot}%{_mandir}/man1
 help2man %{buildroot}%{_bindir}/http > %{buildroot}%{_mandir}/man1/http.1
 help2man %{buildroot}%{_bindir}/https > %{buildroot}%{_mandir}/man1/https.1
+help2man %{buildroot}%{_bindir}/httpie > %{buildroot}%{_mandir}/man1/httpie.1
 
 
 %check
@@ -67,8 +68,10 @@ help2man %{buildroot}%{_bindir}/https > %{buildroot}%{_mandir}/man1/https.1
 %license LICENSE
 %{_bindir}/http
 %{_bindir}/https
+%{_bindir}/httpie
 %{_mandir}/man1/http.1*
 %{_mandir}/man1/https.1*
+%{_mandir}/man1/httpie.1*
 # we co-own the entire directory structures for bash/fish completion to avoid a dependency
 %{_datadir}/bash-completion/
 %{_datadir}/fish/
diff --git a/httpie/manager/plugins.py b/httpie/manager/plugins.py
index 77fc0d12..7760ce23 100644
--- a/httpie/manager/plugins.py
+++ b/httpie/manager/plugins.py
@@ -8,10 +8,8 @@ from contextlib import suppress
 from pathlib import Path
 from typing import Optional, List
 
-import importlib_metadata
-
 from httpie.manager.cli import parser, missing_subcommand
-from httpie.compat import get_dist_name
+from httpie.compat import importlib_metadata, get_dist_name
 from httpie.context import Environment
 from httpie.status import ExitStatus
 
diff --git a/setup.py b/setup.py
index 0269d5ce..acec43b3 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ install_requires = [
     'requests-toolbelt>=0.9.1',
     'multidict>=4.7.0',
     'setuptools',
-    'importlib-metadata>=1.4.0',
+    'importlib-metadata>=1.4.0; python_version < "3.8"',
 ]
 install_requires_win_only = [
     'colorama>=0.2.4',