rpms/eric/devel eric-3.9.5-shebang.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 eric.spec, 1.11, 1.12 sources, 1.4, 1.5 gen_python_api-env.patch, 1.1, NONE gen_sip_api-PyQt4.patch, 1.1, NONE

Johan Cwiklinski (trasher) fedora-extras-commits at redhat.com
Tue Jan 15 17:37:41 UTC 2008 

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8057

Modified Files:
	.cvsignore eric.spec sources 
Added Files:
	eric-3.9.5-shebang.patch 
Removed Files:
	gen_python_api-env.patch gen_sip_api-PyQt4.patch 
Log Message:
New upstream release
Added available translations


eric-3.9.5-shebang.patch:

--- NEW FILE eric-3.9.5-shebang.patch ---
diff -up eric-3.9.5/eric/__init__.py.patch eric-3.9.5/eric/__init__.py
--- eric-3.9.5/eric/__init__.py.patch	2008-01-14 12:53:29.000000000 +0100
+++ eric-3.9.5/eric/__init__.py	2008-01-14 12:53:36.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003 - 2007 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric-3.9.5/eric/uninstall.py.patch eric-3.9.5/uninstall.py
--- eric-3.9.5/eric/uninstall.py.patch	2008-01-14 12:53:00.000000000 +0100
+++ eric-3.9.5/eric/uninstall.py	2008-01-14 12:53:05.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2002-2007 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric-3.9.5/eric/patch_modpython.py.patch eric-3.9.5/patch_modpython.py
--- eric-3.9.5/eric/patch_modpython.py.patch	2008-01-14 12:53:13.000000000 +0100
+++ eric-3.9.5/eric/patch_modpython.py	2008-01-14 12:53:20.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003-2007 Detlev Offenbach <detlev at die-offenbachs.de>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Nov 2006 03:21:53 -0000	1.4
+++ .cvsignore	15 Jan 2008 17:37:01 -0000	1.5
@@ -1,4 +1,4 @@
-gen_python_api_20050605.tar.gz
-gen_sip_api_20060711.tar.gz
-eric-3.9.1.tar.gz
-eric-3.9.2.tar.gz
+eric-3.9.5.tar.gz
+eric-i18n-de-3.9.5.tar.gz
+eric-i18n-fr-3.9.5.tar.gz
+eric-i18n-ru-3.9.5.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eric.spec	27 Aug 2007 13:30:50 -0000	1.11
+++ eric.spec	15 Jan 2008 17:37:01 -0000	1.12
@@ -2,26 +2,25 @@
 # Fedora review
 # http://bugzilla.redhat.com/186919
 
-Name:	 eric
+Name:    eric
 Summary: Python IDE
-Version: 3.9.2
-Release: 3%{?dist}
+Version: 3.9.5
+Release: 1%{?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
+Group:   Development/Tools
+URL:     http://www.die-offenbachs.de/eric/index.html
+Source:  http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-%{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_20060711.tar.gz
-
+Source1: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-fr-%{version}.tar.gz
+Source2: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-de-%{version}.tar.gz
+Source3: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}-i18n-ru-%{version}.tar.gz
 Source10: eric3.desktop
 
 Patch1: eric-3.9.0-prefs.patch
-Patch2: gen_python_api-env.patch
-Patch3: gen_sip_api-PyQt4.patch
+Patch2: eric-3.9.5-shebang.patch
 
 Provides: eric3 = %{version}-%{release}
 
@@ -45,12 +44,17 @@
 
 
 %prep
-%setup -q -a 1 -a 2
+%setup -q -a 1 -a 2 -a 3 
 
 %patch1 -p1 -b .prefs
+%patch2 -p1
 sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
-%patch2 -p0 -b .env
-%patch3 -p0 -b .PyQt4
+
+# copy language files
+mv %{name}-%{version}/%{name}/i18n/*.qm %{name}/i18n/
+mv %{name}-%{version}/%{name}/i18n/*.ts %{name}/i18n/
+rm -rf %{name}-%{version}
+
 
 
 %build
@@ -60,10 +64,6 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/
 
-# Either set PYTHONOPTIMIZE here or 
-# call /usr/lib/rpm/brp-python-bytecompile later (but before generating .pyo file list) 
-# PYTHONOPTIMIZE=1; export PYTHONOPTIMIZE
-
 %{__python} install.py \
   -i %{buildroot}/ \
   -b %{_bindir} \
@@ -78,13 +78,9 @@
   %{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"
@@ -94,13 +90,16 @@
   echo "%ghost %{_datadir}/eric/$api" >> %{name}-files.list
 done
 
-# rpm will autogenerate these (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}
 
 # mostly to make rpmlint happier, non-executable-scripts
 chmod a+x %{buildroot}%{python_sitedir}/eric3/ThirdParty/brm/bike/parsing/fastparser.py ||:
+chmod a+x %{buildroot}%{python_sitedir}/eric3/*.py ||:
+chmod a+x %{buildroot}%{python_sitedir}/eric3/ThirdParty/brm/bike/logging.py
+chmod a+x %{buildroot}%{python_sitedir}/eric3/uninstall.py
+chmod a+x %{buildroot}%{python_sitedir}/eric3/Examples/hallo.py
+chmod a+x %{buildroot}%{python_sitedir}/eric3/DebugClients/Python/PyCoverage.py
+chmod a+x %{buildroot}%{python_sitedir}/eric3/Examples/rhallo.py
+
 
 
 %post
@@ -111,13 +110,6 @@
 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}
@@ -125,22 +117,22 @@
 
 %files -f %{name}-files.list
 %defattr(-,root,root,-)
-%doc eric/README* THANKS HISTORY LICENSE.GPL
+%doc eric/README* THANKS LICENSE.GPL
 %{_bindir}/eric3*
-%{_bindir}/gen_*_api.py
-%exclude %{_bindir}/gen_*_api.py[co]
 %{python_sitedir}/eric3config.py*
 %{python_sitedir}/sitecustomize.py*
 %{python_sitedir}/eric3/
 
 %dir %{_datadir}/eric/
-%{_datadir}/eric/python.api
-%{_datadir}/eric/qt*.api
 %{_datadir}/applications/*eric3.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Fri Jan 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.9.5-1
+- Rebuild for last version
+- Include the translation files
+
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.9.2-3
 - License: GPL+
 - don't set PYTHONOPTIMIZE, let brp-python-bytecompile do it's job,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 03:21:53 -0000	1.4
+++ sources	15 Jan 2008 17:37:01 -0000	1.5
@@ -1,3 +1,4 @@
-fcea430a92e9d88089d91ce3099db282  gen_python_api_20050605.tar.gz
-8b19482530d51c47a02e43a4ca2bbb79  gen_sip_api_20060711.tar.gz
-b3168b9ccf1625950b6a8dcfbdfc7d35  eric-3.9.2.tar.gz
+63d6fb3c302b603577554af62520c948  eric-3.9.5.tar.gz
+46138106a951e2af5c6dbc57cd558186  eric-i18n-de-3.9.5.tar.gz
+7f13aca3d31cc2f18b8d357172662834  eric-i18n-fr-3.9.5.tar.gz
+7b2927ae5a78622939d1e10f226b31cd  eric-i18n-ru-3.9.5.tar.gz


--- gen_python_api-env.patch DELETED ---


--- gen_sip_api-PyQt4.patch DELETED ---

More information about the fedora-extras-commits mailing list