[eric] 6.0.3
Rex Dieter
rdieter at fedoraproject.org
Wed Mar 4 20:29:02 UTC 2015
commit 6cbc3ee84a8b233d51cc63b17f48d65b52f32694
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Mar 4 14:29:00 2015 -0600
6.0.3
.gitignore | 20 +++---
eric.spec | 154 +++++++++++++++++-----------------------
eric4-4.5.25-versioncheck.patch | 12 ----
eric4.desktop | 9 ---
eric6-6.0.1-defaults.patch | 24 +++++++
eric6-6.0.1-dt_validate.patch | 20 ++++++
sources | 20 +++---
7 files changed, 131 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85cb2e0..f389b74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
-/eric4-4.5.25.tar.gz
-/eric4-i18n-cs-4.5.25.tar.gz
-/eric4-i18n-de-4.5.25.tar.gz
-/eric4-i18n-en-4.5.25.tar.gz
-/eric4-i18n-es-4.5.25.tar.gz
-/eric4-i18n-fr-4.5.25.tar.gz
-/eric4-i18n-it-4.5.25.tar.gz
-/eric4-i18n-ru-4.5.25.tar.gz
-/eric4-i18n-tr-4.5.25.tar.gz
-/eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz
/eric-32.png
/eric-48.png
/eric-64.png
+/eric6-6.0.3.tar.gz
+/eric6-i18n-cs-6.0.3.tar.gz
+/eric6-i18n-de-6.0.3.tar.gz
+/eric6-i18n-en-6.0.3.tar.gz
+/eric6-i18n-es-6.0.3.tar.gz
+/eric6-i18n-fr-6.0.3.tar.gz
+/eric6-i18n-it-6.0.3.tar.gz
+/eric6-i18n-ru-6.0.3.tar.gz
+/eric6-i18n-tr-6.0.3.tar.gz
+/eric6-i18n-zh_CN.GB2312-6.0.3.tar.gz
diff --git a/eric.spec b/eric.spec
index e01fb48..8f749ba 100644
--- a/eric.spec
+++ b/eric.spec
@@ -7,67 +7,57 @@
Name: eric
Summary: Python IDE
-Version: 4.5.25
-Release: 2%{?dist}
+Version: 6.0.3
+Release: 1%{?dist}
License: GPLv3+
URL: http://eric-ide.python-projects.org
-Source: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
-
-Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
-Source2: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
-Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-en-%{version}.tar.gz
-Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-es-%{version}.tar.gz
-Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
-Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-it-%{version}.tar.gz
-Source7: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
-Source8: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-%{version}.tar.gz
-Source9: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-zh_CN.GB2312-%{version}.tar.gz
-Source10: eric4.desktop
-
-Source20: eric-32.png
-Source21: eric-48.png
-Source22: eric-64.png
-
-# disable version check (by default)
-Patch1: eric4-4.5.25-versioncheck.patch
-
-Provides: eric4 = %{version}-%{release}
+Source0: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-cs-%{version}.tar.gz
+Source2: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-de-%{version}.tar.gz
+Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-en-%{version}.tar.gz
+Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-es-%{version}.tar.gz
+Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-fr-%{version}.tar.gz
+Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-it-%{version}.tar.gz
+Source7: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-ru-%{version}.tar.gz
+Source8: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-tr-%{version}.tar.gz
+Source9: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}6-i18n-zh_CN.GB2312-%{version}.tar.gz
+BuildArch: noarch
+
+Source30: eric-32.png
+Source31: eric-48.png
+Source32: eric-64.png
+
+# sane defaults: disable version check, qt4 configuration
+Patch1: eric6-6.0.1-defaults.patch
+# make eric6.desktop validate, upstreamable
+Patch2: eric6-6.0.1-dt_validate.patch
BuildRequires: desktop-file-utils
-BuildRequires: PyQt4 PyQt4-webkit
-BuildRequires: qscintilla-python
-BuildRequires: python
+BuildRequires: python3-devel python3
+BuildRequires: python3-qt5
+BuildRequires: python3-qscintilla-qt5
%if 0%{?fedora} > 19
BuildRequires: libappstream-glib
%endif
-Requires: PyQt4 PyQt4-webkit
-Requires: qscintilla-python
-
-# for documentation
-Requires: python-docs
-Requires: qt4-designer
+Provides: eric6 = %{version}-%{release}
-%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
-%global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%global pyqt_ver %(%{__python} -c "from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR")
+Requires: python3-qt5
+Requires: python3-qscintilla-qt5
%description
-eric4 is a full featured Python IDE.
+eric6 is a full featured Python IDE.
%prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -n eric4-%{version}
+%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -n eric6-%{version}
-%patch1 -p1 -b .versioncheck
+%patch1 -p1 -b .defaults
+%patch2 -p1 -b .dt_validate
# copy language files
-mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
-rm -rf %{name}-%{version}
-
-# add qt4 suffix
-sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' eric/Preferences/__init__.py
+cp -a eric6-%{version}/* .
%build
@@ -77,45 +67,28 @@ sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' eric/Preferen
%install
mkdir -p %{buildroot}/
-%{__python} install.py \
+%{__python3} install.py \
-i %{buildroot}/ \
-b %{_bindir} \
- -d %{python_sitedir}
-
-# correct api path to remove %{builddir}
-sed -i -e 's|%{buildroot}||' %{buildroot}%{python_sitedir}/eric4config.py
-
-desktop-file-install \
- --dir %{buildroot}%{_datadir}/applications/ \
- --vendor="" \
- %{SOURCE10}
+ -d %{python3_sitelib}
# icons
-install -m644 -p -D %{SOURCE20} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png
-install -m644 -p -D %{SOURCE21} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/eric4.png
-install -m644 -p -D %{SOURCE22} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/eric4.png
-
-## generate api files
-mkdir -p %{buildroot}%{_datadir}/eric/
+install -m644 -p -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric6.png
+install -m644 -p -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/eric6.png
+install -m644 -p -D %{SOURCE32} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/eric6.png
-# %ghost'd api files (package separately?) -- Rex
-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
- touch %{buildroot}%{_datadir}/eric/$api
- echo "%ghost %{_datadir}/eric/$api" >> %{name}-files.list
-done
-
-# add envrionment variables for documentations
-# FIXME: try to query for some of these at runtime, instead of setting a static value @ buildtime
-# e.g. %_libdir/pkgconfig/Qt.pc has these, but it's currently in qt-devel (rats)
-sed -i -e \
- 's|exec|QT4DIR=%{_qt4_prefix}\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?python_ver}/html\nQT4DOCDIR=%{_qt4_docdir}/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' \
- %{buildroot}%{_bindir}/eric4
+## unpackaged files
+# deprecated icons
+rm -rfv %{buildroot}%{_datadir}/pixmaps/eric*
+# Python2 files that python3 byte-compiler doesn't like
+# FIXME: find way to byte-compile this with python2 instead
+rm -rfv %{buildroot}%{python3_sitelib}/eric6/DebugClients/Python/
%check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/eric4.appdata.xml ||:
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/eric6.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/eric6.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/eric6_webbrowser.desktop
%post
@@ -130,23 +103,30 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-%files -f %{name}-files.list
+%files
%doc eric/README* THANKS LICENSE.GPL3
-%{_bindir}/eric4*
-%{python_sitedir}/eric4config.py*
-%{python_sitedir}/eric4/
-%{python_sitedir}/eric4plugins/
-%{python_sitedir}/eric4.pth
-%dir %{_datadir}/eric/
-%{_datadir}/appdata/eric4.appdata.xml
-%{_datadir}/applications/*eric4.desktop
-%{_datadir}/icons/hicolor/*/apps/eric4.*
-%{_datadir}/pixmaps/eric4.*
-%{_libdir}/qt4/qsci/api/python/*.api
-%{_libdir}/qt4/qsci/api/ruby/*.api
+%{_bindir}/eric6*
+%{python3_sitelib}/eric6config.py*
+%{python3_sitelib}/__pycache__/eric6config.*
+%{python3_sitelib}/eric6/
+%{python3_sitelib}/eric6plugins/
+#dir %{_datadir}/eric/
+%{_datadir}/appdata/eric6.appdata.xml
+%{_datadir}/applications/eric6.desktop
+%{_datadir}/applications/eric6_webbrowser.desktop
+%{_datadir}/icons/hicolor/*/apps/eric6.*
+%{_datadir}/qt5/qsci/api/python/*
+%{_datadir}/qt5/qsci/api/qss/*
+%{_datadir}/qt5/qsci/api/ruby/*
%changelog
+* Wed Mar 04 2015 Rex Dieter <rdieter at fedoraproject.org> 6.0.3-1
+- 6.0.3
+
+* Sun Jan 25 2015 Rex Dieter <rdieter at fedoraproject.org> 6.0.1-1
+- first try at eric6
+
* Mon Dec 29 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.5.25-2
- disable update check (by default)
- fix/improve icons
diff --git a/eric6-6.0.1-defaults.patch b/eric6-6.0.1-defaults.patch
new file mode 100644
index 0000000..91b72df
--- /dev/null
+++ b/eric6-6.0.1-defaults.patch
@@ -0,0 +1,24 @@
+diff -up eric6-6.0.1/eric/Preferences/__init__.py.versioncheck eric6-6.0.1/eric/Preferences/__init__.py
+--- eric6-6.0.1/eric/Preferences/__init__.py.versioncheck 2015-01-05 09:16:36.148476464 -0600
++++ eric6-6.0.1/eric/Preferences/__init__.py 2015-01-25 16:39:39.721704929 -0600
+@@ -176,7 +176,7 @@ class Prefs(object):
+ "SingleCloseButton": False,
+ "SplitOrientationVertical": False,
+
+- "PerformVersionCheck": 4,
++ "PerformVersionCheck": 0,
+ # 0 = off
+ # 1 = at startup
+ # 2 = daily
+@@ -879,9 +879,9 @@ class Prefs(object):
+
+ # defaults for Qt related stuff
+ qtDefaults = {
+- "Qt4TranslationsDir": "",
++ "Qt4TranslationsDir": "/usr/share/qt4/translations",
+ "QtToolsPrefix4": "",
+- "QtToolsPostfix4": "",
++ "QtToolsPostfix4": "-qt4",
+ "PyuicIndent": 4,
+ "PyuicFromImports": False,
+ }
diff --git a/eric6-6.0.1-dt_validate.patch b/eric6-6.0.1-dt_validate.patch
new file mode 100644
index 0000000..6665776
--- /dev/null
+++ b/eric6-6.0.1-dt_validate.patch
@@ -0,0 +1,20 @@
+diff -up eric6-6.0.1/eric/eric6.desktop.dt_validate eric6-6.0.1/eric/eric6.desktop
+--- eric6-6.0.1/eric/eric6.desktop.dt_validate 2015-01-18 05:08:50.620304991 -0600
++++ eric6-6.0.1/eric/eric6.desktop 2015-01-25 17:15:30.214405227 -0600
+@@ -11,5 +11,5 @@ Comment=Integrated Development Environme
+ Comment[de]=Integrierte Entwicklungsumgebung für Python
+ GenericName=IDE for Python
+ GenericName[de]=IDE für Python
+-Categories=Qt;Python;Development;IDE;
++Categories=Qt;X-Python;Development;IDE;
+ StartupNotify=true
+diff -up eric6-6.0.1/eric/eric6_webbrowser.desktop.dt_validate eric6-6.0.1/eric/eric6_webbrowser.desktop
+--- eric6-6.0.1/eric/eric6_webbrowser.desktop.dt_validate 2015-01-18 05:08:50.620304991 -0600
++++ eric6-6.0.1/eric/eric6_webbrowser.desktop 2015-01-25 17:17:46.312016079 -0600
+@@ -11,5 +11,5 @@ Comment=Web Browser for PyQt5
+ Comment[de]=Web Browser für PyQt5
+ GenericName=Web Browser
+ GenericName[de]=Web Browser
+-Categories=Qt;Python;Network;WebBrowser;
++Categories=Qt;X-Python;Network;WebBrowser;
+ StartupNotify=true
diff --git a/sources b/sources
index cd9aa74..4219e67 100644
--- a/sources
+++ b/sources
@@ -1,13 +1,13 @@
-f68cdadacfa10298c89300e0c4036324 eric4-4.5.25.tar.gz
-7e62ddae2bd85fe14888dbbf4a8c4f2f eric4-i18n-cs-4.5.25.tar.gz
-6fdde79ecaf8d19c12078406d0f72b80 eric4-i18n-de-4.5.25.tar.gz
-be31efb97dc597cc58ba86461f972874 eric4-i18n-en-4.5.25.tar.gz
-f97682c7b1eb973b07f1c7c5e55e5280 eric4-i18n-es-4.5.25.tar.gz
-d2995d9157c3adbcc2673479155492e2 eric4-i18n-fr-4.5.25.tar.gz
-2c4d8776010fe03888453051f717286c eric4-i18n-it-4.5.25.tar.gz
-fc45341b525363af7f8abe6e731515d9 eric4-i18n-ru-4.5.25.tar.gz
-caf114f5c217125b6567fb71dbd9d7bf eric4-i18n-tr-4.5.25.tar.gz
-4b6bc9dd37a002be1b8adf3ddb489bc3 eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz
3744d777d4956b323082e83c18ae4c3f eric-32.png
d4bcdd49baf9c56796ba9a1573ceb151 eric-48.png
553bf30aa5c3c0978969ea0997c12089 eric-64.png
+5dd99e132b51b5fda50056be617aa73c eric6-6.0.3.tar.gz
+15ac5e14a140b61d0fd37236050e479b eric6-i18n-cs-6.0.3.tar.gz
+59d89628f1d90ecc0892120eb73ebab7 eric6-i18n-de-6.0.3.tar.gz
+cab3a375011c4b895d66da0aa851a15f eric6-i18n-en-6.0.3.tar.gz
+5ed1b44098c40039a6b4e8d6bc19133f eric6-i18n-es-6.0.3.tar.gz
+94e77f5ca0f1b622572d584271926959 eric6-i18n-fr-6.0.3.tar.gz
+f3ed679c3ce0c6d1c682d1e3d8f66a95 eric6-i18n-it-6.0.3.tar.gz
+e35a17ad04a6f466667456e441f99120 eric6-i18n-ru-6.0.3.tar.gz
+f8b377870232b6145384164b259bf32c eric6-i18n-tr-6.0.3.tar.gz
+45eabe9ab061e52a5ded9be81786dee7 eric6-i18n-zh_CN.GB2312-6.0.3.tar.gz
More information about the scm-commits
mailing list