diff --git a/tortoisehg.spec b/tortoisehg.spec index e7652ef..2dd8300 100644 --- a/tortoisehg.spec +++ b/tortoisehg.spec @@ -8,12 +8,12 @@ URL: https://tortoisehg.bitbucket.org/ Source0: https://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{version}.tar.gz Source1: thg.appdata.xml BuildArch: noarch -BuildRequires: python2-devel, gettext, python-sphinx, python2-enum34, python2-qt5, desktop-file-utils, libappstream-glib -Requires: python-iniparse, mercurial >= 4.5, mercurial < 4.7 +BuildRequires: python2-devel, gettext, python2-sphinx, python2-enum34, python2-qt5, desktop-file-utils, libappstream-glib +Requires: python2-iniparse, mercurial >= 4.5, mercurial < 4.7 # gconf needed at util/shlib.py for browse_url(url). Requires: gnome-python2-gconf -Requires: python2-qt5, python2-qscintilla-qt5, python-pygments -Requires: python-gobject-base +Requires: python2-qt5, python2-qscintilla-qt5, python2-pygments +Requires: python2-gobject-base %description This package contains the thg command line tool, which provides a graphical @@ -21,7 +21,7 @@ user interface to the Mercurial distributed revision control system. %package nautilus Summary: Mercurial GUI plug-in to the Nautilus file manager -Requires: %{name} = %{version}-%{release}, nautilus-python +Requires: %{name} = %{version}-%{release}, python2-nautilus %description nautilus This package contains the TortoiseHg Gnome/Nautilus extension, which makes the @@ -49,7 +49,7 @@ rm doc/build/html/.buildinfo %install %py2_install -rm $RPM_BUILD_ROOT/%{python_sitelib}/hgext3rd/__init__.* +rm $RPM_BUILD_ROOT/%{python2_sitelib}/hgext3rd/__init__.* mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d install -pm0644 contrib/mergetools.rc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/thgmergetools.rc @@ -69,9 +69,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/thg.ap %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/thgmergetools.rc %{_bindir}/thg %{_datadir}/appdata/thg.appdata.xml -%{python_sitelib}/hgext3rd/thg.py* -%{python_sitelib}/tortoisehg/ -%{python_sitelib}/tortoisehg-*.egg-info +%{python2_sitelib}/hgext3rd/thg.py* +%{python2_sitelib}/tortoisehg/ +%{python2_sitelib}/tortoisehg-*.egg-info %{_datadir}/pixmaps/tortoisehg/ %{_datadir}/pixmaps/thg_logo.svg %{_datadir}/applications/thg.desktop @@ -84,6 +84,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/thg.ap - tortoisehg 4.6.1 - Rename appdata thg.appdata.xml #1570409 - python2-enum34 is also needed for building ... but apparently not at runtime +- Bump all Python references to Python2 * Tue Jul 24 2018 Mads Kiilerich - 4.6-3 - TortoiseHg actually require python-qt5 and python2-qscintilla-qt5 now