diff --git a/python-qutepart.spec b/python-qutepart.spec index eb852bf..1ff36e8 100644 --- a/python-qutepart.spec +++ b/python-qutepart.spec @@ -1,6 +1,3 @@ -%global commit0 fdc29c79eb6f3228897cfb713e047bf1d9a48198 -%global date0 20160229 - %global srcname qutepart %global sum Code editor widget %global desc_common \ @@ -16,169 +13,77 @@ Qutepart is a code editor widget for PyQt. Features: \ - Rectangular selection and copy-paste. \ - Linter marks support. -# python3 is default in Fedoras, python2 still for EPEL -%if 0%{?fedora} -%bcond_without python3 -%bcond_with python2 -%else -%bcond_with python3 -%bcond_without python2 -%endif - Name: python-%{srcname} -Version: 2.2.3 -Release: 1.%{date0}git%(c=%{commit0}; echo ${c:0:7})%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: %{sum} License: LGPLv2+ URL: https://github.com/hlamer/%{srcname} -Source0: %{url}/archive/%{commit0}.tar.gz#/%{srcname}-%{commit0}.tar.gz -#v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz +# upstream script to run tests is not useful for Fedora package, use from v2.2 instead +Source1: run_tests_fedora.py BuildRequires: pcre-devel -%if %{with python2} -BuildRequires: PyQt4 -BuildRequires: python2-devel >= 2.7 -BuildRequires: python-setuptools -BuildRequires: python-sphinx -%endif - -%if 0%{with python3} BuildRequires: python3-qt5 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-sphinx -%endif BuildRequires: xorg-x11-server-Xvfb %description %{desc_common} - -%package -n python2-%{srcname} -Summary: %{sum} -Requires: pcre -Requires: PyQt4 -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} -%{desc_common} - - %package -n python3-%{srcname} Summary: %{sum} Requires: pcre Requires: python3-qt5 -%{?python_provide:%python_provide python3-%{srcname}} -%if 0%{?fedora} >= 24 +Provides: python-%{srcname} Obsoletes: python2-%{srcname} -%endif %description -n python3-%{srcname} %{desc_common} %prep -%setup -q -n %{srcname}-%{commit0} - -%if 0%{with python3} -mkdir py3 -find -mindepth 1 -maxdepth 1 -not -name py3 |xargs cp -pr -tpy3 -pushd py3 - -# FIXME dirty hacks to prevent gcc errors cause of c-api change in python3 -#sed -i /ob_type/d %{srcname}/syntax/cParser.c -#sed -i -r 's,PyString_AsString\((.*)\).*;,\1;,' %{srcname}/syntax/cParser.c +%setup -q -n %{srcname}-%{version} # disable PyQt5 mocking for sphinx sed -i -r 's,(MOCK_MODULES = \[).*\],\1],' doc/source/conf.py -# disable sloppy tests -pushd tests -#rm test_bookmarks.py -#rm test_bracket_hlighter.py -#rm test_completion.py -#rm test_edit.py -popd - -popd # py3 -%endif - - %build -%if %{with python2} -# we need CFLAGS for internal gcc call, py2_build sets them -%py2_build -pushd doc -sphinx-build source html -popd -%endif - -%if 0%{with python3} -pushd py3 %py3_build pushd doc sphinx-build-3 source html -popd -popd -%endif - # E: non-standard-executable-perm -find -name \*.so |xargs chmod 0755 +#find -name \*.so |xargs chmod 0755 # W: hidden-file-or-dir -find -name html -exec rm -r '{}'/.buildinfo '{}'/.doctrees \; - +rm -r html/.buildinfo html/.doctrees %install -%if %{with python2} -%py2_install -%endif - -%if 0%{with python3} -pushd py3 %py3_install -popd -%endif %check -# ignore those really weird "fatal warnings" from dbus to not confuse tests -export DBUS_FATAL_WARNINGS=0 - -%if %{with python2} pushd tests -# do some fake X -xvfb-run %{__python2} run_all.py -popd -%endif - -%if 0%{with python3} -pushd py3/tests -xvfb-run -a %{__python3} run_all.py -%endif +cp %{SOURCE1} . +# do some fake X +xvfb-run %{__python3} run_tests_fedora.py -%if %{with python2} -%files -n python2-%{srcname} -%license LICENSE -%doc README.md ChangeLog todo.txt -%doc doc/html/ -%{python2_sitearch}/%{srcname}* -%endif - - -%if 0%{with python3} %files -n python3-%{srcname} %license LICENSE %doc README.md ChangeLog todo.txt -%doc py3/doc/html/ +%doc doc/html/ %{python3_sitearch}/%{srcname}* -%endif %changelog +* Thu Apr 21 2016 Raphael Groner - 3.0.0-1 +- bump to v3.0.0, now python3 only, rhbz#1328450 + * Wed Mar 02 2016 Raphael Groner - 2.2.3-1.20160229gitfdc29c7 - use upstream master as post-release