From ccf518bdcc0f72e651164c57506039d0fa9ff333 Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk@redhat.com>
Date: Nov 23 2020 18:05:33 +0000
Subject: [PATCH 1/2] Rebase to 1.0.2.1


- Transfer to Python3
- Requires Mercurial v5.4+ for Python3 (mercurial-py3)
- Resolves: rhbz#1738965, rhbz#1893525

---

diff --git a/.gitignore b/.gitignore
index 3a76373..4500937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /git-remote-hg-0.3.tar.gz
 /git-remote-hg-0.4.tar.gz
 /git-remote-hg-1.0.0.tar.gz
+/git-remote-hg-1.0.2.1.tar.gz
diff --git a/git-remote-hg.spec b/git-remote-hg.spec
index 47be216..52a0530 100644
--- a/git-remote-hg.spec
+++ b/git-remote-hg.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 Name:           git-remote-hg
-Version:        1.0.0
-Release:        6%{?dist}
+Version:        1.0.2.1
+Release:        1%{?dist}
 BuildArch:      noarch
 Summary:        Mercurial wrapper for git
 License:        GPLv2+
@@ -13,10 +13,11 @@ Source0:        https://github.com/mnauw/%{name}/archive/v%{version}.tar.gz#/%{n
 # The second commit (to the tests) isn't needed against 0.2
 
 BuildRequires:  asciidoc >= 8.4.1
-BuildRequires:  python2-devel
-Requires:       python2
+BuildRequires:  python3-devel
+Requires:       python3
 Requires:       git >= 2.0.0
-Requires:       mercurial >= 3.5
+Requires:       mercurial >= 5.4
+Requires:       mercurial-py3
 Obsoletes:      git-hg
 
 %description
@@ -27,7 +28,7 @@ repositories as if they were Git ones.
 %prep
 %setup -q
 #%patch01 -p1
-sed -i -e "1 s|^#!.*|#!%{__python2}|" git-remote-hg
+sed -i -e "1 s|^#!.*|#!%{__python3}|" git-remote-hg
 sed -i -e 's|\tinstall|\tinstall -p|' Makefile
 
 %build
@@ -48,6 +49,12 @@ make install-doc
 %{_mandir}/man1/*
 
 %changelog
+* Mon Nov 23 2020 Petr Stodulka <pstodulk@redhat.com> - 1.0.2.1-1
+- Rebase to 1.0.2.1
+- Transfer to Python3
+- Requires Mercurial v5.4+ for Python3 (mercurial-py3)
+- Resolves: rhbz#1738965, rhbz#1893525
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 0f5b43c..0f36289 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-remote-hg-1.0.0.tar.gz) = 344349b8c64db5ad629176c664713773b4e8fe5ddf6bd13e7f3cac421f82eeb93fdd8aa59a2baab4b36b533cd6721adf8d31c69d4cc761e43c093c4d531c1a7d
+SHA512 (git-remote-hg-1.0.2.1.tar.gz) = 722de4946e12fbeed40303682406455fcad347f718ac2f849982e6beaba263e434065ed44318aa9676431214ddd059ac917fe744c468f8388381fa2829183dcb

From 15bebe7292fbb1bc90651f876becff56b45c9dfc Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Nov 26 2020 18:21:16 +0000
Subject: [PATCH 2/2] require git-core rather than git to reduce dependencies


Nothing in git-remote-hg appears to require the tools from git rather
than git-core.  Avoid pulling in the extra dependencies of git.

---

diff --git a/git-remote-hg.spec b/git-remote-hg.spec
index 52a0530..bea97ac 100644
--- a/git-remote-hg.spec
+++ b/git-remote-hg.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 Name:           git-remote-hg
 Version:        1.0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 BuildArch:      noarch
 Summary:        Mercurial wrapper for git
 License:        GPLv2+
@@ -15,7 +15,7 @@ Source0:        https://github.com/mnauw/%{name}/archive/v%{version}.tar.gz#/%{n
 BuildRequires:  asciidoc >= 8.4.1
 BuildRequires:  python3-devel
 Requires:       python3
-Requires:       git >= 2.0.0
+Requires:       git-core >= 2.0.0
 Requires:       mercurial >= 5.4
 Requires:       mercurial-py3
 Obsoletes:      git-hg
@@ -49,6 +49,9 @@ make install-doc
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 26 2020 Todd Zullinger <tmz@pobox.com> - 1.0.2.1-2
+- require git-core rather than git to reduce dependencies
+
 * Mon Nov 23 2020 Petr Stodulka <pstodulk@redhat.com> - 1.0.2.1-1
 - Rebase to 1.0.2.1
 - Transfer to Python3