rpms/eric/devel eric4-4.1.0-install_py-createGlobalPluginsDir.patch, NONE, 1.1 eric4-4.1.0-shebang.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 eric.spec, 1.19, 1.20 sources, 1.6, 1.7 eric-3.9.5-shebang.patch, 1.1, NONE eric4-4.0.4-preferences.patch, 1.1, NONE

Johan Cwiklinski (trasher) fedora-extras-commits at redhat.com
Mon Feb 4 21:05:17 UTC 2008 

Author: trasher

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

Modified Files:
	.cvsignore eric.spec sources 
Added Files:
	eric4-4.1.0-install_py-createGlobalPluginsDir.patch 
	eric4-4.1.0-shebang.patch 
Removed Files:
	eric-3.9.5-shebang.patch eric4-4.0.4-preferences.patch 
Log Message:
Rebuild for 4.1.0
Error: Requires PyQt4, not PyQt


eric4-4.1.0-install_py-createGlobalPluginsDir.patch:

--- NEW FILE eric4-4.1.0-install_py-createGlobalPluginsDir.patch ---
--- eric4-4.1.0/install.py.orig	2008-02-03 07:30:54.000000000 -0700
+++ eric4-4.1.0/install.py	2008-02-04 03:01:52.959774413 -0700
@@ -182,8 +182,11 @@ def createGlobalPluginsDir():
     Create the global plugins directory, if it doesn't exist.
     """
     global modDir
+    global distDir
     
     pdir = os.path.join(modDir, "eric4plugins")
+    if distDir:
+        pdir = distDir + pdir
     fname = os.path.join(pdir, "__init__.py")
     if not os.path.exists(fname):
         if not os.path.exists(pdir):

eric4-4.1.0-shebang.patch:

--- NEW FILE eric4-4.1.0-shebang.patch ---
diff -up eric4-4.1.0/eric/uninstall.py.patch eric4-4.1.0/eric/uninstall.py
--- eric4-4.1.0/eric/uninstall.py.patch	2008-02-04 20:59:23.000000000 +0100
+++ eric4-4.1.0/eric/uninstall.py	2008-02-04 20:59:31.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2002-2008 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.1.0/eric/patch_modpython.py.patch eric4-4.1.0/eric/patch_modpython.py
--- eric4-4.1.0/eric/patch_modpython.py.patch	2008-02-04 20:59:04.000000000 +0100
+++ eric4-4.1.0/eric/patch_modpython.py	2008-02-04 20:59:16.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003-2008 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.1.0/eric/__init__.py.patch eric4-4.1.0/eric/__init__.py
--- eric4-4.1.0/eric/__init__.py.patch	2008-02-04 20:58:41.000000000 +0100
+++ eric4-4.1.0/eric/__init__.py	2008-02-04 20:58:49.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003 - 2008 Detlev Offenbach <detlev at die-offenbachs.de>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Jan 2008 21:47:46 -0000	1.6
+++ .cvsignore	4 Feb 2008 21:04:36 -0000	1.7
@@ -1,5 +1,5 @@
-eric4-4.0.4.tar.gz
-eric4-i18n-cs_CZ-4.0.4.tar.gz
-eric4-i18n-de-4.0.4.tar.gz
-eric4-i18n-fr-4.0.4.tar.gz
-eric4-i18n-ru-4.0.4.tar.gz
+eric4-4.1.0.tar.gz
+eric4-i18n-cs-4.1.0.tar.gz
+eric4-i18n-de-4.1.0.tar.gz
+eric4-i18n-fr-4.1.0.tar.gz
+eric4-i18n-ru-4.1.0.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eric.spec	29 Jan 2008 22:01:32 -0000	1.19
+++ eric.spec	4 Feb 2008 21:04:36 -0000	1.20
@@ -4,8 +4,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.0.4
-Release: 4%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -17,11 +17,11 @@
 Source1: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
 Source2: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
 Source3: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
-Source4: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs_CZ-%{version}.tar.gz
+Source4: http://dl.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
 Source10: eric4.desktop
 
-Patch1: eric-3.9.5-shebang.patch
-Patch2: eric4-4.0.4-preferences.patch
+Patch1:    eric4-4.1.0-install_py-createGlobalPluginsDir.patch
+Patch2:    eric4-4.1.0-shebang.patch
 
 Provides: eric4 = %{version}-%{release}
 
@@ -31,7 +31,7 @@
 BuildRequires: PyQt4-devel
 
 # This can be left unversioned
-Requires: PyQt
+Requires: PyQt4
 Requires: qscintilla-python
 
 
@@ -56,6 +56,8 @@
 
 %patch1 -p1
 %patch2 -p1
+
+sed -i -e 's|"QtToolsPostfix4" : ""|"QtToolsPostfix4" : "-qt4"|' eric/Preferences/__init__.py
 sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
 
 # copy language files
@@ -99,7 +101,6 @@
 # mostly to make rpmlint happier, non-executable-scripts
 chmod a+x %{buildroot}%{python_sitedir}/eric4/ThirdParty/brm/bike/parsing/fastparser.py ||:
 chmod a+x %{buildroot}%{python_sitedir}/eric4/*.py ||:
-chmod a+x %{buildroot}%{python_sitedir}/eric4/ThirdParty/brm/bike/logging.py
 chmod a+x %{buildroot}%{python_sitedir}/eric4/uninstall.py
 chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/hallo.py
 chmod a+x %{buildroot}%{python_sitedir}/eric4/DebugClients/Python/PyCoverage.py
@@ -128,8 +129,8 @@
 %doc eric/README* THANKS LICENSE.GPL
 %{_bindir}/eric4*
 %{python_sitedir}/eric4config.py*
-%{python_sitedir}/sitecustomize.py*
 %{python_sitedir}/eric4/
+%{python_sitedir}/eric4plugins/
 
 %dir %{_datadir}/eric/
 %{_datadir}/applications/*eric4.desktop
@@ -137,6 +138,10 @@
 
 
 %changelog
+* Mon Feb 04 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.1.0-1
+- 4.1.0
+- Requires PyQt4, not PyQt
+
 * Tue Jan 29 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.0.4-4
 - define qt_ver and pyqt_ver
 - use environment variables to set documentation path


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Jan 2008 21:47:46 -0000	1.6
+++ sources	4 Feb 2008 21:04:36 -0000	1.7
@@ -1,5 +1,5 @@
-1886926945a95c92f2151d5135120c67  eric4-4.0.4.tar.gz
-e502d9bc965fb036f3b8457319186c42  eric4-i18n-cs_CZ-4.0.4.tar.gz
-9ac505738bd5516de1a783a337899f71  eric4-i18n-de-4.0.4.tar.gz
-54255e7d984d360079822acd7e9f7172  eric4-i18n-fr-4.0.4.tar.gz
-4b57dd3dfcb3b4567a4d3e6ea7d880e6  eric4-i18n-ru-4.0.4.tar.gz
+2ab6fa6daa21c48d0b4630c424f7e5c5  eric4-4.1.0.tar.gz
+81e384d046e9e38b7145b4713455a4c1  eric4-i18n-cs-4.1.0.tar.gz
+141a25fc9f96c2d96f715ad6ebe639d4  eric4-i18n-de-4.1.0.tar.gz
+139068df86e2616068dbb55fea185e9b  eric4-i18n-fr-4.1.0.tar.gz
+7e183807460920eaf234d0bf35812c31  eric4-i18n-ru-4.1.0.tar.gz


--- eric-3.9.5-shebang.patch DELETED ---


--- eric4-4.0.4-preferences.patch DELETED ---

More information about the fedora-extras-commits mailing list