rpms/eric/devel eric-3.9.0-prefs.patch, NONE, 1.1 eric.spec, NONE, 1.1 eric3.desktop, NONE, 1.1 gen_python_api-env.patch, NONE, 1.1 gen_sip_api-PyQt4.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jul 27 11:52:18 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/devel
Modified Files:
.cvsignore sources
Added Files:
eric-3.9.0-prefs.patch eric.spec eric3.desktop
gen_python_api-env.patch gen_sip_api-PyQt4.patch
Log Message:
auto-import eric-3.9.0-5 on branch devel from eric-3.9.0-5.src.rpm
eric-3.9.0-prefs.patch:
--- NEW FILE eric-3.9.0-prefs.patch ---
--- eric-3.9.0/eric/Preferences/__init__.py.prefs 2006-04-02 03:53:29.000000000 -0500
+++ eric-3.9.0/eric/Preferences/__init__.py 2006-05-11 15:09:52.000000000 -0500
@@ -190,12 +190,16 @@
}
editorOtherFontsDefaults = {
- "MarginsFont" : "Helvetica,12,-1,5,50,0,0,0,0,0",
- "MonospacedFont" : "Courier,12,-1,5,50,0,0,0,0,0"
+ "MarginsFont" : "sans-serif,12,-1,5,50,0,0,0,0,0",
+ "MonospacedFont" : "monospace,12,-1,5,50,0,0,0,0,0"
}
+ pyApiList = QStringList()
+ for file in ["python", "qt", "qttext", "qtcanvas", "qtgl", "qtnetwork", "qtsql", "qttable", "qtui", "qtxml"]:
+ pyApiList.append(QString("@APIDIR@/%s.api" % file))
+
editorAPIDefaults = {
- "Python" : QStringList(),
+ "Python" : pyApiList,
"C++" : QStringList(),
"C#" : QStringList(),
"IDL" : QStringList(),
--- NEW FILE eric.spec ---
# Fedora review
# http://bugzilla.redhat.com/186919
Name: eric
Summary: Python IDE
Version: 3.9.0
Release: 5%{?dist}
License: GPL
Group: Development/Tools
URL: http://www.die-offenbachs.de/detlev/eric3.html
Source: http://dl.sourceforge.net/sourceforge/eric-ide/eric-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source1: http://www.die-offenbachs.de/detlev/contributions/gen_python_api_20050605.tar.gz
Source2: http://www.die-offenbachs.de/detlev/contributions/gen_sip_api_20060123.tar.gz
Source10: eric3.desktop
Patch1: eric-3.9.0-prefs.patch
Patch2: gen_python_api-env.patch
Patch3: gen_sip_api-PyQt4.patch
BuildRequires: desktop-file-utils
# See http://bugzilla.redhat.com/bugzilla/188496
BuildRequires: PyQt-qscintilla
# PyQt api's
BuildRequires: PyQt-devel
%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5)
%if "%{?pyqt_ver}" > "2"
Requires: PyQt = %{pyqt_ver}
%endif
Requires: PyQt-qscintilla
%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()")
Requires: python-abi = %{python_ver}
%description
eric3 is a full featured Python IDE that is written in PyQt using
the QScintilla editor widget.
%prep
%setup -q -a 1 -a 2
%patch1 -p1 -b .prefs
sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
%patch2 -p0 -b .env
%patch3 -p0 -b .PyQt4
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/
# generate .pyo files? No, for now, it's fast enough as-is. -- Rex
PYTHONOPTIMIZE=1; export PYTHONOPTIMIZE
%{__python} install.py \
-i %{buildroot}/ \
-b %{_bindir} \
-d %{python_sitedir}
desktop-file-install \
--dir %{buildroot}/%{_datadir}/applications/ \
--add-category="X-Fedora" --vendor="" \
%{SOURCE10}
install -m644 -p -D \
%{buildroot}%{python_sitedir}/eric3/icons/default/eric.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric3.png
# install gen_*_api.py tools
install -m755 -p gen_*_api.py %{buildroot}%{_bindir}/
## generate api files
mkdir -p %{buildroot}%{_datadir}/eric/
%{__python} gen_python_api.py %{buildroot}%{_datadir}/eric/
%{__python} gen_sip_api.py --qt %{buildroot}%{_datadir}/eric/
# %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
# rpm will autogenerate these only on some Fedora releases;
# create them here so they can be excluded later
touch %{buildroot}%{_bindir}/gen_sip_api.py{c,o}
touch %{buildroot}%{_bindir}/gen_python_api.py{c,o}
# Having to ghost the .pyo files sucks; this makes it tolerable.
find %{buildroot}%{python_sitedir} -type d | \
sed 's:%{buildroot}\(.*\):%dir \1:' >> %{name}-files.list
find %{buildroot}%{python_sitedir} -not -type d -not -name '*.pyo' | \
sed 's:%{buildroot}\(.*\):\1:' >> %{name}-files.list
find %{buildroot}%{python_sitedir} -not -type d -name '*.pyo' | \
sed 's:%{buildroot}\(.*\):%ghost \1:' >> %{name}-files.list
%if "%{?fedora}" > "4"
# These two files are created by RPM
echo "%ghost %{python_sitedir}/eric3config.pyo" >> %{name}-files.list
echo "%ghost %{python_sitedir}/sitecustomize.pyo" >> %{name}-files.list
%endif
# mostly to make rpmlint happier, non-executable-scripts
chmod a+x %{buildroot}%{python_sitedir}/eric3/ThirdParty/brm/bike/parsing/fastparser.py ||:
%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%triggerin -- PyQt4-devel
%{__python} %{_bindir}/gen_sip_api.py --qt4 %{_datadir}/eric/ >& /dev/null ||:
# Not sure about this one, it takes awhile (1+ minutes) to finish. -- Rex
%triggerin -- PyKDE-devel
%{__python} %{_bindir}/gen_sip_api.py --kde %{_datadir}/eric/ >& /dev/null ||:
%clean
rm -rf %{buildroot}
%files -f %{name}-files.list
%defattr(-,root,root,-)
%doc eric/README* THANKS HISTORY LICENSE.GPL
%{_bindir}/eric3*
%{_bindir}/gen_*_api.py*
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%dir %{_datadir}/eric/
%{_datadir}/eric/python.api
%{_datadir}/eric/qt*.api
%{_datadir}/applications/*eric3.desktop
%{_datadir}/icons/hicolor/*/*/*
%changelog
* Wed Jul 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.0-5
- make fastparser.py eXecutable
- s/$RPM_BUILD_ROOT/%%buildroot/
* Wed Jul 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.0-4
- fix fedora > 4 %%ghost'ing case.
* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.0-3
- %%ghost .pyo files
* Thu May 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.0-2
- merge -fonts,-api patches into -prefs patch, make it work on
fc5/python24 too
* Mon May 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.9.0-1
- 3.9.0
- create/own %%{_datadir}/eric, for .api files
- generate .api files for python, PyQt
- %%triggerin PyQt4/PyKDE to (auto)generate .api files
* Wed Apr 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
- --vendor=""
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-2
- cleanup/drop unused bits
- note PyQt-qscintilla submission (#188496)
* Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-1
- 3.8.2
* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.1-1
- 3.8.1
- include gen_python_api, gen_sip_api
* Sun Sep 18 2005 Rex Dieter 3.7.2-0.1.kde
- 3.7.2
* Wed Sep 14 2005 Rex Dieter 3.7.1-0.1.kde
- 3.7.1
* Mon Jun 13 2005 Rex Dieter 0:3.6.1-0.1.kde
- cleanup
* Sat Jan 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:3.6.1-0.fdr.1
- 3.6.1
- TODO: package .api files as (one or more) separate .noarch.rpms
* Mon Nov 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:3.5.1-0.fdr.2
- get icons right
* Mon Nov 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:3.5.1-0.fdr.1
- 3.5.1
* Fri Oct 08 2004 Rex Dieter <rexdieter at sf.net> 0:3.5.0-0.fdr.1
- 3.5.0
* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:3.4.2-0.fdr.2
- remove Provides: eric3, (redundant) Provides: eric
- allow build going back as far as rh73.
* Sun May 30 2004 Aurelien Bompard <gauret[AT]free.fr> 0:3.4.2-0.fdr.1
- Initial RPM package
--- NEW FILE eric3.desktop ---
[Desktop Entry]
Name=Eric
Comment=Python IDE
Exec=eric3
Icon=eric3
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Development;
gen_python_api-env.patch:
--- NEW FILE gen_python_api-env.patch ---
--- gen_python_api.py.env 2005-06-05 01:49:26.000000000 -0500
+++ gen_python_api.py 2006-05-01 11:25:36.000000000 -0500
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
'''gen_python_api.py generates a python.api file for eric3
The generated api file includes
gen_sip_api-PyQt4.patch:
--- NEW FILE gen_sip_api-PyQt4.patch ---
--- ./gen_sip_api.py.PyQt4 2006-01-23 14:24:24.000000000 -0600
+++ ./gen_sip_api.py 2006-05-01 12:11:21.000000000 -0500
@@ -355,7 +355,7 @@
if qt4tag is None:
qt4tag = 'Qt_4_1_0'
- sipdir = PyQt4.pyqtconfig._pkg_config['pyqt_sip_dir']+"/PyQt4"
+ sipdir = PyQt4.pyqtconfig._pkg_config['pyqt_sip_dir']
sipdir = os.path.abspath(sipdir)
if not os.path.isdir(sipdir):
print "The directory (%s) containing the sipfiles does not exist. Aborting..." % sipdir
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Jul 2006 11:51:45 -0000 1.1
+++ .cvsignore 27 Jul 2006 11:52:18 -0000 1.2
@@ -0,0 +1,3 @@
+eric-3.9.0.tar.gz
+gen_python_api_20050605.tar.gz
+gen_sip_api_20060123.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Jul 2006 11:51:45 -0000 1.1
+++ sources 27 Jul 2006 11:52:18 -0000 1.2
@@ -0,0 +1,3 @@
+2d2c4f85787b34671c76dea1436da8ae eric-3.9.0.tar.gz
+fcea430a92e9d88089d91ce3099db282 gen_python_api_20050605.tar.gz
+b4915d45d8a788e275d73957c7b78798 gen_sip_api_20060123.tar.gz
More information about the scm-commits
mailing list