From 7481f0e2c46999016a3c5fc19d067d6d950020a9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Aug 14 2017 10:03:23 +0000 Subject: Clean up packaging --- diff --git a/rabbitvcs.spec b/rabbitvcs.spec index 1c88649..44ba937 100644 --- a/rabbitvcs.spec +++ b/rabbitvcs.spec @@ -5,29 +5,25 @@ %global _pkgdocdir %{_defaultdocdir}/%{name} %endif -%bcond_with gedit +%bcond_with gedit -%global sum Graphical user interface to version control systems +%global sum Graphical user interface to version control systems -# python_provide needs srcname to be defined -%global srcname rabbitvcs - -Name: %{srcname} +Name: rabbitvcs Version: 0.17 Release: 1%{?dist} Summary: %{sum} + License: GPLv2+ -# Caution! Intentionally no www in URL. -URL: http://%{name}.org +URL: http://rabbitvcs.org Source0: https://github.com/rabbitvcs/rabbitvcs/archive/v%{version}/rabbitvcs-%{version}.tar.gz -Patch0: %{name}-ignore-post-install.patch +Patch0: rabbitvcs-ignore-post-install.patch BuildArch: noarch BuildRequires: pygtk2-devel BuildRequires: python2-devel - %if 0%{?fedora} BuildRequires: python3-gobject BuildRequires: python3-devel @@ -45,40 +41,40 @@ Requires: mercurial Requires: subversion # rhbz#1226816 - Gedit plugin not working with Gedit later than version 3.12 %if %{without gedit} -Obsoletes: %{name}-gedit +Obsoletes: rabbitvcs-gedit < %{version}-%{release} %endif %description core Contains files shared between the RabbitVCS extensions. -%package -n python2-%{name} +%package -n python2-rabbitvcs Summary: %{sum} -%{?python_provide:%python_provide python2-%{srcname}} +%{?python_provide:%python_provide python2-rabbitvcs} Requires: %{name}-core = %{version}-%{release} Requires: python2-configobj -Requires: python-dulwich -Requires: python-simplejson +Requires: python2-dulwich +Requires: python2-simplejson Requires: pygtk2-libglade Requires: pysvn -# rhbz#1304642 - python-six needs Tkinter -Requires: python-mtTkinter +Requires: python2-tkinter -%description -n python2-%{name} +%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. %if %{with python3} -%package -n python3-%{name} +%package -n python3-rabbitvcs Summary: %{sum} -%{?python_provide:%python_provide python3-%{srcname}} +%{?python_provide:%python_provide python3-rabbitvcs} Requires: %{name}-core = %{version}-%{release} Requires: python3-configobj Requires: python3-dulwich -Requires: python3-simplejson Requires: python3-gobject Requires: python3-pysvn +Requires: python3-simplejson +Requires: python3-tkinter -%description -n python3-%{name} +%description -n python3-rabbitvcs RabbitVCS is a set of graphical tools written to provide simple and straightforward access to the version control systems you use. %endif @@ -94,7 +90,7 @@ A command line command to use RabbitVCS %package caja Summary: Caja extension for RabbitVCS # caja needs python2 for plugins -Requires: python2-%{name} = %{version}-%{release} +Requires: python2-rabbitvcs = %{version}-%{release} Requires: caja Requires: python-caja Requires: dbus-python @@ -106,7 +102,7 @@ source control system. %package nautilus Summary: Nautilus extension for RabbitVCS # nautilus needs python2 for plugins -Requires: python2-%{name} = %{version}-%{release} +Requires: python2-rabbitvcs = %{version}-%{release} Requires: nautilus Requires: nautilus-python Requires: dbus-python @@ -118,7 +114,7 @@ source control system. %package nemo Summary: Nemo extension for RabbitVCS # nemo needs python2 for plugins -Requires: python2-%{name} = %{version}-%{release} +Requires: python2-rabbitvcs = %{version}-%{release} Requires: nemo Requires: nemo-python Requires: dbus-python @@ -130,7 +126,7 @@ source control system. %package thunar Summary: Thunar extension for RabbitVCS # thunar needs python2 for plugins -Requires: python2-%{name} = %{version}-%{release} +Requires: python2-rabbitvcs = %{version}-%{release} Requires: thunar Requires: thunarx-python Requires: dbus-python @@ -143,7 +139,7 @@ source control system. %package gedit Summary: Gedit extension for RabbitVCS # gedit needs python3 for plugins -Requires: python3-%{name} = %{version}-%{release} +Requires: python3-rabbitvcs = %{version}-%{release} Requires: gedit %description gedit @@ -152,8 +148,7 @@ source control system. %endif %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %py2_build @@ -166,17 +161,17 @@ source control system. %if %{with python3} %py3_install %endif -install -p -m0755 clients/cli/%{name} -D %{buildroot}%{_bindir}/%{name} +install -p -m0755 clients/cli/rabbitvcs -D %{buildroot}%{_bindir}/rabbitvcs %if %{with gedit} -install -p -m0644 clients/gedit/%{name}-plugin.py -D %{buildroot}%{_datadir}/gedit/plugins/%{name}-plugin.py -install -p -m0644 clients/gedit/%{name}-gedit3.plugin -D %{buildroot}%{_datadir}/gedit/plugins/%{name}.plugin +install -p -m0644 clients/gedit/rabbitvcs-plugin.py -D %{buildroot}%{_datadir}/gedit/plugins/rabbitvcs-plugin.py +install -p -m0644 clients/gedit/rabbitvcs-gedit3.plugin -D %{buildroot}%{_datadir}/gedit/plugins/rabbitvcs.plugin %endif install -p -m0644 clients/caja/RabbitVCS.py -D %{buildroot}%{_datadir}/caja-python/extensions/RabbitVCS.py install -p -m0644 clients/nautilus-3.0/RabbitVCS.py -D %{buildroot}%{_datadir}/nautilus-python/extensions/RabbitVCS.py 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 -%find_lang RabbitVCS +%find_lang RabbitVCS %post core touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -190,24 +185,23 @@ fi %posttrans core gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f RabbitVCS.lang core %license COPYING %{_pkgdocdir}/ -%{_datadir}/%{name}/ +%{_datadir}/rabbitvcs/ %{_datadir}/icons/hicolor/16x16/actions/rabbitvcs-push.png %{_datadir}/icons/hicolor/scalable/*/*.svg -%files -n python2-%{name} +%files -n python2-rabbitvcs %{python2_sitelib}/* %if %{with python3} -%files -n python3-%{name} +%files -n python3-rabbitvcs %{python3_sitelib}/* %endif %files cli -%{_bindir}/%{name} +%{_bindir}/rabbitvcs %if %{with gedit} %files gedit @@ -226,10 +220,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files thunar %{_datadir}/thunarx-python/extensions/*.py* -# we own global folders to prevent a bug in thunarx-python package -%dir %{_datadir}/thunarx-python -%dir %{_datadir}/thunarx-python/extensions - %changelog * Mon Aug 14 2017 Pete Walter - 0.17-1