From ea4da891d691cff28aca8fa9d78e976ce24f9b03 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Apr 07 2019 13:26:17 +0000 Subject: tortoisehg 4.9 --- diff --git a/.gitignore b/.gitignore index 45e12c3..8b6eb3b 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ tortoisehg-1.1.2.tar.gz /tortoisehg-4.5.3.tar.gz /tortoisehg-4.6.tar.gz /tortoisehg-4.6.1.tar.gz +/tortoisehg-4.9.tar.gz diff --git a/sources b/sources index 633e724..a8688fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tortoisehg-4.6.1.tar.gz) = adf5ebfc7a76843b62f66feddfde42c0f915c970a951e037f082ee4a6b393822b023f116dc650d5242838d006dc572235a4089c3805929727435588c24ded480 +SHA512 (tortoisehg-4.9.tar.gz) = cc7b0360c6b362b0b9695a484b59eea879e1d4e28ed68e98ce6975342a22ddafc97976c5b0cdea289bfd78932dacf76c0b236e36bec48acd48ee361f2c09ff13 diff --git a/tortoisehg.spec b/tortoisehg.spec index 7e1fa33..0c97a1e 100644 --- a/tortoisehg.spec +++ b/tortoisehg.spec @@ -1,6 +1,6 @@ Name: tortoisehg -Version: 4.6.1 -Release: 2%{?dist} +Version: 4.9 +Release: 1%{?dist} Summary: Mercurial GUI command line tool thg License: GPLv2 # - few files are however under the more permissive GPLv2+ @@ -9,7 +9,7 @@ Source0: https://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{versi Source1: thg.appdata.xml BuildArch: noarch BuildRequires: python2-devel, gettext, python2-sphinx, python2-enum34, python2-qt5, desktop-file-utils, libappstream-glib -Requires: python2-iniparse, mercurial >= 4.5, mercurial < 4.7 +Requires: python2-iniparse, mercurial >= 4.7, mercurial < 4.10 # gconf needed at util/shlib.py for browse_url(url). Requires: gnome-python2-gconf Requires: python2-qt5, python2-qscintilla-qt5, python2-pygments @@ -41,6 +41,12 @@ icon_path = "%{_datadir}/pixmaps/tortoisehg/icons" nofork = True EOT +# Hack to try to support Mercurial 4.7 until it gets upgraded +sed -i "s/testedwith = '4.8 4.9'/testedwith = '4.7 4.8 4.9'/" tortoisehg/util/hgversion.py + +# Avoid wrong upgrade recommendation caused by (4, 9) < (4, 9, 0) +sed -i '/curver = (0,0,0)/a\ if len(curver) < 3: curver = curver + (0,)' tortoisehg/hgqt/bugreport.py + %build %py2_build @@ -80,6 +86,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/thg.ap %{_datadir}/nautilus-python/extensions/nautilus-thg.py* %changelog +* Sun Apr 07 2019 Mads Kiilerich - 4.9-1 +- tortoisehg 4.9 + * Sun Feb 03 2019 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild