From 435154a46beecb83e1ae1144d09d8739d1977243 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Feb 04 2008 21:04:36 +0000 Subject: Rebuild for 4.1.0 Error: Requires PyQt4, not PyQt --- diff --git a/.cvsignore b/.cvsignore index 389e8fb..f384c26 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/eric-3.9.5-shebang.patch b/eric-3.9.5-shebang.patch deleted file mode 100644 index 2294809..0000000 --- a/eric-3.9.5-shebang.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 -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 -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 diff --git a/eric.spec b/eric.spec index 754f59b..2794513 100644 --- a/eric.spec +++ b/eric.spec @@ -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 @@ BuildArch: noarch 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: qscintilla-python BuildRequires: PyQt4-devel # This can be left unversioned -Requires: PyQt +Requires: PyQt4 Requires: qscintilla-python @@ -56,6 +56,8 @@ eric4 is a full featured Python IDE. %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 @@ done # 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 @@ rm -rf %{buildroot} %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 @@ rm -rf %{buildroot} %changelog +* Mon Feb 04 2008 Johan Cwiklinski 4.1.0-1 +- 4.1.0 +- Requires PyQt4, not PyQt + * Tue Jan 29 2008 Johan Cwiklinski 4.0.4-4 - define qt_ver and pyqt_ver - use environment variables to set documentation path diff --git a/eric4-4.0.4-preferences.patch b/eric4-4.0.4-preferences.patch deleted file mode 100644 index 92d2a31..0000000 --- a/eric4-4.0.4-preferences.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up eric4-4.0.4/eric/Preferences/__init__.py.patch eric4-4.0.4/eric/Preferences/__init__.py ---- eric4-4.0.4/eric/Preferences/__init__.py.patch 2008-01-29 22:36:32.000000000 +0100 -+++ eric4-4.0.4/eric/Preferences/__init__.py 2008-01-29 22:39:33.000000000 +0100 -@@ -649,8 +649,9 @@ def readPreferences(prefClass = Prefs): - - # read the entries for Qt settings - prefClass.qtPrefs = {} -+ prefClass.qtPrefs["QtToolsPostfix4"] = "-qt4" - for key in ["QtDir", "Qt4Dir", "Qt4TranslationsDir", "QtToolsPrefix3", -- "QtToolsPostfix3", "QtToolsPrefix4", "QtToolsPostfix4"]: -+ "QtToolsPostfix3", "QtToolsPrefix4"]: - prefClass.qtPrefs[key] = \ - prefClass.settings.value("Qt/" + key, - QtCore.QVariant(prefClass.qtDefaults[key])).toString() diff --git a/eric4-4.1.0-install_py-createGlobalPluginsDir.patch b/eric4-4.1.0-install_py-createGlobalPluginsDir.patch new file mode 100644 index 0000000..978036f --- /dev/null +++ b/eric4-4.1.0-install_py-createGlobalPluginsDir.patch @@ -0,0 +1,14 @@ +--- 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): diff --git a/eric4-4.1.0-shebang.patch b/eric4-4.1.0-shebang.patch new file mode 100644 index 0000000..cb712a6 --- /dev/null +++ b/eric4-4.1.0-shebang.patch @@ -0,0 +1,24 @@ +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 +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 +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 diff --git a/sources b/sources index af6a4b1..8aac472 100644 --- a/sources +++ b/sources @@ -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