From 9296b4a45996b0d26b51296bcd18dea5c3bda9ff Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Nov 15 2015 22:40:16 +0000 Subject: Create symbolic links to tor-prompt --- diff --git a/python-stem.spec b/python-stem.spec index 10c0948..3f4949f 100644 --- a/python-stem.spec +++ b/python-stem.spec @@ -3,7 +3,7 @@ Name: python-stem Version: 1.4.1b -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python controller library for Tor Group: Development/Libraries @@ -33,12 +33,25 @@ Stem is a python controller library for Tor. It uses Tor’s control protocol to help developers program against the Tor process. +%package -n python2-%{pkgname} +Summary: Python controller library for Tor +Group: Development/Libraries +%{?python_provide:%python_provide python2-%{pkgname}} +Suggests: %{name}-doc = %{version}-%{release} + +%description -n python2-%{pkgname} +Stem is a python controller library for Tor. +It uses Tor’s control protocol to help developers program against the +Tor process. + %if 0%{?with_python3} -%package -n python3-stem -Summary: Python3 controller library for Tor +%package -n python3-%{pkgname} +Summary: Python controller library for Tor Group: Development/Libraries +%{?python_provide:%python_provide python3-%{pkgname}} +Suggests: %{name}-doc = %{version}-%{release} -%description -n python3-stem +%description -n python3-%{pkgname} Stem is a python controller library for Tor. It uses Tor’s control protocol to help developers program against the Tor process. @@ -56,7 +69,7 @@ Tor process. This package contains documentation files for Stem. %prep -%setup -q -n %{pkgname}-1.4.1 +%autosetup -n %{pkgname}-1.4.1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -65,29 +78,38 @@ cp -a . %{py3dir} %build -%{__python2} setup.py build - +%py2_build %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py build +%py3_build popd %endif pushd docs -make %{?_smp_mflags} html -make %{?_smp_mflags} text -make %{?_smp_mflags} man +%make_build html +%make_build text +%make_build man popd %install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} +%py3_install mv %{buildroot}%{_bindir}/tor-prompt %{buildroot}%{_bindir}/python3-tor-prompt popd +pushd %{buildroot}%{_bindir} +for i in tor-prompt-3 tor-prompt-%{?python3_version}; do + ln -s python3-tor-prompt $i +done +popd %endif - -%{__python2} setup.py install --skip-build --root %{buildroot} +%py2_install +mv %{buildroot}%{_bindir}/tor-prompt %{buildroot}%{_bindir}/python-tor-prompt +pushd %{buildroot}%{_bindir} +for i in tor-prompt tor-prompt-2 tor-prompt-%{?python2_version}; do + ln -s python-tor-prompt $i +done +popd mv -f docs/_build/html docs/ mv -f docs/_build/text docs/ @@ -103,16 +125,21 @@ pushd %{py3dir} popd %endif -%files +%files -n python2-%{pkgname} %license LICENSE +%{_bindir}/python-tor-prompt %{_bindir}/tor-prompt +%{_bindir}/tor-prompt-2 +%{_bindir}/tor-prompt-%{?python2_version} %{python2_sitelib}/%{pkgname} %{python2_sitelib}/%{pkgname}-*.egg-info %if 0%{?with_python3} -%files -n python3-stem +%files -n python3-%{pkgname} %license LICENSE %{_bindir}/python3-tor-prompt +%{_bindir}/tor-prompt-3 +%{_bindir}/tor-prompt-%{?python3_version} %{python3_sitelib}/%{pkgname} %{python3_sitelib}/%{pkgname}-*.egg-info %endif @@ -123,6 +150,10 @@ popd %{_mandir}/man1/%{pkgname}.1* %changelog +* Sun Nov 15 2015 Juan Orti Alcaine - 1.4.1b-3 +- Use python_provide macro +- Create symbolic links to tor-prompt + * Tue Nov 10 2015 Fedora Release Engineering - 1.4.1b-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5