diff --git a/rabbitvcs.spec b/rabbitvcs.spec index 6df7b73..e7c541c 100644 --- a/rabbitvcs.spec +++ b/rabbitvcs.spec @@ -13,10 +13,9 @@ Patch0: rabbitvcs-ignore-post-install.patch BuildArch: noarch -BuildRequires: pygtk2-devel -BuildRequires: python2-devel /usr/bin/pathfix.py -BuildRequires: python3-gobject BuildRequires: python3-devel +BuildRequires: python3-gobject +BuildRequires: /usr/bin/pathfix.py %description RabbitVCS is a set of graphical tools written to provide simple @@ -34,21 +33,6 @@ Obsoletes: rabbitvcs-gedit < %{version}-%{release} %description core Contains files shared between the RabbitVCS extensions. -%package -n python2-rabbitvcs -Summary: %{sum} -%{?python_provide:%python_provide python2-rabbitvcs} -Requires: %{name}-core = %{version}-%{release} -Requires: python2-configobj -Requires: python2-dulwich -Requires: python2-pysvn -Requires: python2-simplejson -Requires: pygtk2-libglade -Requires: python2-tkinter - -%description -n python2-rabbitvcs -RabbitVCS is a set of graphical tools written to provide simple -and straightforward access to the version control systems you use. - %package -n python3-rabbitvcs Summary: %{sum} %{?python_provide:%python_provide python3-rabbitvcs} @@ -122,14 +106,12 @@ source control system. %prep %autosetup -p1 -pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build -%py2_build %py3_build %install -%py2_install %py3_install install -p -m0755 clients/cli/rabbitvcs -D %{buildroot}%{_bindir}/rabbitvcs install -p -m0644 clients/caja/RabbitVCS.py -D %{buildroot}%{_datadir}/caja-python/extensions/RabbitVCS.py @@ -137,7 +119,7 @@ install -p -m0644 clients/nautilus-3.0/RabbitVCS.py -D %{buildroot}%{_datadir}/n install -p -m0644 clients/nemo/RabbitVCS.py -D %{buildroot}%{_datadir}/nemo-python/extensions/RabbitVCS.py install -p -m0644 clients/thunar/RabbitVCS.py -D %{buildroot}%{_datadir}/thunarx-python/extensions/RabbitVCS.py -pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{_bindir}/rabbitvcs +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/rabbitvcs %find_lang RabbitVCS @@ -148,9 +130,6 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{_bindir}/rabbitv %{_datadir}/icons/hicolor/16x16/actions/rabbitvcs-push.png %{_datadir}/icons/hicolor/scalable/*/*.svg -%files -n python2-rabbitvcs -%{python2_sitelib}/* - %files -n python3-rabbitvcs %{python3_sitelib}/* @@ -172,6 +151,7 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{_bindir}/rabbitv %changelog * Fri Aug 30 2019 Pete Walter - 0.17.1-13 - Switch thunar support to Python 3 in F32 (#1738160) +- Drop python2-rabbitvcs in F32 (#1738183) - Update nautilus-python requires * Mon Aug 19 2019 Miro HronĨok - 0.17.1-12