From 3577af8a81e52b785a27ec016798452293bf1cd5 Mon Sep 17 00:00:00 2001 From: Ercole 'ercolinux' Carpanetto Date: Fri, 5 Jan 2024 22:07:26 +0100 Subject: [PATCH] update to 20.3 [release 20.3-1mamba;Thu Mar 26 2020] --- eric.spec | 91 +++++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/eric.spec b/eric.spec index 199f70b..5c79193 100644 --- a/eric.spec +++ b/eric.spec @@ -1,7 +1,7 @@ %define MAJver 6 %define pkgver %(echo %version | cut -d. -f1-2 | tr -d 0) Name: eric -Version: 19.08 +Version: 20.3 Release: 1mamba Summary: A full featured Python and Ruby editor and IDE, written in Python Group: Graphical Desktop/Applications/Development @@ -9,25 +9,28 @@ Vendor: openmamba Distribution: openmamba Packager: Stefano Cotta Ramusino URL: http://eric-ide.python-projects.org -Source: https://sourceforge.net/projects/eric-ide/files/eric6/stable/%{version}/eric6-%{pkgver}.tar.gz +Source: http://downloads.sourceforge.net/sourceforge/eric-ide/eric6-%{version}.tar.gz +#Source: https://sourceforge.net/projects/eric-ide/files/eric6/stable/%{version}/eric6-%{pkgver}.tar.gz Source9: eric4.desktop Patch0: eric4-4.3.9-python.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: libpython-devel ## AUTOBUILDREQ-END -BuildRequires: python-qscintilla-py36 >= 2.10.8-2mamba +BuildRequires: python-qscintilla-py3 >= 2.10.8-2mamba BuildRequires: python-qscintilla-devel >= 2.10.8-2mamba BuildRequires: python-xml BuildRequires: qscintilla-devel -BuildRequires: PyQt5-py36 +BuildRequires: PyQt5-py3 BuildRequires: PyQt5-devel -BuildRequires: pyqtwebengine-py36 -Requires: PyQt5-py36 -Requires: python-qscintilla-py36 +BuildRequires: PyQtChart-py3 +BuildRequires: pyqtwebengine-py3 +Requires: PyQt5-py3 +Requires: PyQtChart-py3 +Requires: python-qscintilla-py3 Requires: libqt5-designer -Requires: python-sip-py36 -Requires: pyqtwebengine-py36 +Requires: python-sip-py3 +Requires: pyqtwebengine-py3 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -36,66 +39,53 @@ It is designed to be usable as everdays' quick and dirty editor as well as being Eric includes a plugin system, which allows easy extension of the IDE functionality with plugins downloadable from the net. %prep -%setup -q -n eric%{MAJver}-%{pkgver} +%setup -q -n eric%{MAJver}-%{version} #%patch0 -p1 %build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python36} install.py \ - -a %{buildroot}%{_datadir}/qt5/qsci/api \ +%{__python3} install.py \ -i %{buildroot}/ \ - -b %{buildroot}%{_bindir} \ - -d %{buildroot}%{python36_sitearch} + -a %{_datadir}/qt5/qsci/api \ + -b %{_bindir} \ + -d %{python3_sitearch} -# Remove %{builddir} in API path -sed -i -e 's|%{buildroot}||' %{buildroot}%{python36_sitearch}/eric%{MAJver}config.py +## Remove %{builddir} in API path +#sed -i -e 's|%{buildroot}||' %{buildroot}%{python3_sitearch}/eric%{MAJver}config.py -# Generate api files -install -d %{buildroot}%{_datadir}/eric/ -PyQt4_apis="QtAssistant.api QtCore.api QtGui.api QtNetwork.api QtOpenGL.api QtSql.api QtSvg.api QtXml.api" -PyKDE_apis="dcop.api kdecore.api kdefx.api kdeprint.api kdeui.api kfile.api khtml.api kmdi.api kparts.api kspell.api kutils.api" -for api in $PyQt4_apis $PyKDE_apis ; do - > %{buildroot}%{_datadir}/eric/$api - echo "%ghost %{_datadir}/eric/$api" >> %{name}-api.list -done +## Generate api files +#install -d %{buildroot}%{_datadir}/eric/ +#PyQt4_apis="QtAssistant.api QtCore.api QtGui.api QtNetwork.api QtOpenGL.api QtSql.api QtSvg.api QtXml.api" +#PyKDE_apis="dcop.api kdecore.api kdefx.api kdeprint.api kdeui.api kfile.api khtml.api kmdi.api kparts.api kspell.api kutils.api" +#for api in $PyQt4_apis $PyKDE_apis ; do +# > %{buildroot}%{_datadir}/eric/$api +# echo "%ghost %{_datadir}/eric/$api" >> %{name}-api.list +#done -# Fix some permission -#chmod a+x %{buildroot}%{python3_sitearch}/eric%{MAJver}/ThirdParty/brm/bike/parsing/fastparser.py ||: -chmod a+x %{buildroot}%{python36_sitearch}/eric%{MAJver}/*.py ||: -#chmod a+x %{buildroot}%{python36_sitearch}/eric%{MAJver}/uninstall.py -#chmod a+x %{buildroot}%{python36_sitearch}/eric%{MAJver}/Examples/hallo.py -#chmod a+x %{buildroot}%{python36_sitearch}/eric%{MAJver}/Examples/rhallo.py +## Fix some permission +#chmod a+x %{buildroot}%{python3_sitearch}/eric%{MAJver}/*.py ||: -# Add environment variables for PySide, PyQt5, PyKDE5, Qt, Qt5 and Python documentations -sed -i -e 's|exec|QT5DIR=%{_qt5_prefix}\nPYTHONDOCDIR=\$(echo %{_docdir}/python-[0-9\.]*/html)\nQT5DOCDIR=%{_qt5_docdir}/html\nPYQT5DOCDIR=\$(echo %{_docdir}/PyQt5-devel-*/html)\nPYKDE5DOCDIR=\$(echo %{_docdir}/PyKDE5-devel-*/html)\nPYSIDEDOCDIR=$(echo %{_docdir}/python-pyside-devel-*/html)\nexport QT5DIR PYTHONDOCDIR QTDOCDIR QT5DOCDIR PYQT5DOCDIR PYKDE5DOCDIR PYSIDEDOCDIR\n&|' %{buildroot}%{_bindir}/eric%{MAJver} -#sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python36_sitearch}/eric4/Preferences/__init__.py - -#desktop-file-install \ -# --dir %{buildroot}/%{_datadir}/applications/ \ -# --vendor="" \ -# %{S:9} -# -#install -m 644 -p -D \ -# %{buildroot}%{python_sitearch}/eric4/icons/default/eric.png \ -# %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png +## Add environment variables for PySide, PyQt5, PyKDE5, Qt, Qt5 and Python documentations +#sed -i -e 's|exec|QT5DIR=%{_qt5_prefix}\nPYTHONDOCDIR=\$(echo %{_docdir}/python-[0-9\.]*/html)\nQT5DOCDIR=%{_qt5_docdir}/html\nPYQT5DOCDIR=\$(echo %{_docdir}/PyQt5-devel-*/html)\nPYKDE5DOCDIR=\$(echo %{_docdir}/PyKDE5-devel-*/html)\nPYSIDEDOCDIR=$(echo %{_docdir}/python-pyside-devel-*/html)\nexport QT5DIR PYTHONDOCDIR QTDOCDIR QT5DOCDIR PYQT5DOCDIR PYKDE5DOCDIR PYSIDEDOCDIR\n&|' %{buildroot}%{_bindir}/eric%{MAJver} +##sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python3_sitearch}/eric4/Preferences/__init__.py %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%files -f %{name}-api.list +%files %defattr(-,root,root) %{_bindir}/eric%{MAJver} %{_bindir}/eric%{MAJver}_* -%dir %{python36_sitearch}/eric%{MAJver} -%{python36_sitearch}/eric%{MAJver}/* -%{python36_sitearch}/eric%{MAJver}config.py -%dir %{python36_sitearch}/eric%{MAJver}plugins -%{python36_sitearch}/eric%{MAJver}plugins/__init__.py +%dir %{python3_sitearch}/eric%{MAJver} +%{python3_sitearch}/eric%{MAJver}/* +%{python3_sitearch}/eric%{MAJver}config.py +%dir %{python3_sitearch}/eric%{MAJver}plugins +%{python3_sitearch}/eric%{MAJver}plugins/__init__.py %{_datadir}/applications/eric%{MAJver}.desktop %{_datadir}/metainfo/eric%{MAJver}.appdata.xml -%{_datadir}/applications/eric%{MAJver}_webbrowser.desktop +#%{_datadir}/applications/eric%{MAJver}_webbrowser.desktop %{_datadir}/applications/eric%{MAJver}_browser.desktop %{_datadir}/pixmaps/eric*.png %{_datadir}/qt5/qsci/api/python/* @@ -105,6 +95,9 @@ sed -i -e 's|exec|QT5DIR=%{_qt5_prefix}\nPYTHONDOCDIR=\$(echo %{_docdir}/python- #README README-i18n.txt %changelog +* Thu Mar 26 2020 Ercole 'ercolinux' Carpanetto 20.3-1mamba +- update to 20.3 + * Sat Aug 17 2019 Silvan Calarco 19.08-1mamba - update to 19.08