From 15c587b54d60be1108cf91a14eefcbc57db53c93 Mon Sep 17 00:00:00 2001 From: Mateusz Korniak Date: Fri, 2 Sep 2016 13:23:25 +0200 Subject: [PATCH] Killed rest of py2/3 ifs. --- eric6.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/eric6.spec b/eric6.spec index 0fa2e97..8b4671d 100644 --- a/eric6.spec +++ b/eric6.spec @@ -6,7 +6,7 @@ Summary(pl.UTF-8): Eric6 - pełnowartościowe IDE dla Pythona # Name must match the python module/package name (as on pypi or in 'import' statement) Name: eric6 Version: 6.1.8 -Release: 0.5 +Release: 0.6 License: GPL v3 Group: Libraries/Python Source0: https://sourceforge.net/projects/eric-ide/files/eric6/stable/%{version}/eric6-%{version}.tar.gz @@ -15,7 +15,6 @@ URL: http://eric-ide.python-projects.org/index.html BuildRequires: rpm-pythonprov # for the py_build, py_install macros BuildRequires: rpmbuild(macros) >= 1.714 -%if %{with python2} BuildRequires: python-modules BuildRequires: python-setuptools # NOTE: As for 6.1.8 eric6 still tries to import PyQt5 while having PyQt4 leading to crash @@ -26,12 +25,6 @@ BuildRequires: python-setuptools # for --pyqt=5 BuildRequires: python-PyQt5-qscintilla2 BuildRequires: python-PyQt5-uic - -%endif -%if %{with python3} -BuildRequires: python3-modules -BuildRequires: python3-setuptools -%endif Requires: python-modules BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -58,7 +51,6 @@ python install.py -z -c -b %{_bindir} -d %{py_sitescriptdir} -i $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%if %{with python2} %files %defattr(644,root,root,755) %doc README.rst @@ -84,4 +76,3 @@ rm -rf $RPM_BUILD_ROOT # file %{_datadir}/qt4/qsci/api/ruby/Ruby-1.8.7.api from install of eric6-6.1.8-0.1.noarch conflicts with file from package eric4-4.5.24-3.noarch %{py_sitescriptdir}/eric6config.py %{py_sitescriptdir}/eric6plugins -%endif -- 2.43.0