From 2158850c93b6d4c5389f429b3974716e94e4e10d Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 6 Jan 2021 10:48:38 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-httpretty.git#dec15db94e2f2ad4aaf443193e46805d62579ed2
---
 .gitignore            |  1 +
 python-httpretty.spec | 15 +++++++--------
 sources               |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9fed39..53be7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /httpretty-0.9.6.tar.gz
 /httpretty-0.9.7.tar.gz
 /httpretty-1.0.2.tar.gz
+/httpretty-1.0.5.tar.gz
diff --git a/python-httpretty.spec b/python-httpretty.spec
index 2759362..1650021 100644
--- a/python-httpretty.spec
+++ b/python-httpretty.spec
@@ -11,17 +11,12 @@
 #global shortcommit     %%(c=%%{github_commit}; echo ${c:0:7})
 #global github_date     20161011
 
-
-%if %{defined fedora} && 0%{?fedora} < 34
 %global run_tests 1
-%else
-%global run_tests 0
-%endif
 
 Name:           python-httpretty
-Version:        1.0.2
+Version:        1.0.5
 # If github_date is defined, assume a post-release snapshot
-Release:        4%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        1%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        HTTP request mock tool for Python
 
 License:        MIT
@@ -160,11 +155,15 @@ LANG=C.UTF-8 %{__python2} -m nose -v
 %doc README.rst
 %license COPYING
 %{python3_sitelib}/httpretty
-%{python3_sitelib}/httpretty-%{version}-py3.?.egg-info
+%{python3_sitelib}/httpretty-%{version}-py%{python3_version}.egg-info
 %endif
 
 
 %changelog
+* Wed Jan  6 2021 Jiri Popelka <jpopelka@redhat.com> - 1.0.5-1
+- 1.0.5
+- Enable tests for F34 (#1896191 has been resolved)
+
 * Tue Oct 13 2020 Jiri Popelka <jpopelka@redhat.com> - 1.0.2-4
 - Temporarily run tests on Fedora < 34 only
 
diff --git a/sources b/sources
index cf1bbc1..106a0fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (httpretty-1.0.2.tar.gz) = f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
+SHA512 (httpretty-1.0.5.tar.gz) = 2e5f4834848ab1a0b84230f000afb0409b30b3cc1769d36ad61f712f56abc8d6076e7507598f791fe343ce282cf9e26939add71ef794ead2836badfc2321d6bb