rpms/eric/devel eric4-4.0.4-preferences.patch, NONE, 1.1 eric.spec, 1.18, 1.19

[Johan Cwiklinski (trasher)]

Author: trasher

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

Modified Files:
	eric.spec 
Added Files:
	eric4-4.0.4-preferences.patch 
Log Message:
use environment variables to set documentation path
init preferences to have relevant qt commands suffix
add missing PyQt4 require


eric4-4.0.4-preferences.patch:

--- NEW FILE eric4-4.0.4-preferences.patch ---
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()


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- eric.spec	29 Jan 2008 16:34:02 -0000	1.18
+++ eric.spec	29 Jan 2008 22:01:32 -0000	1.19
@@ -5,7 +5,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -21,6 +21,7 @@
 Source10: eric4.desktop
 
 Patch1: eric-3.9.5-shebang.patch
+Patch2: eric4-4.0.4-preferences.patch
 
 Provides: eric4 = %{version}-%{release}
 
@@ -30,8 +31,10 @@
 BuildRequires: PyQt4-devel
 
 # This can be left unversioned
+Requires: PyQt
 Requires: qscintilla-python
 
+
 # Need this for the documentation
 Requires: python-docs
 Requires: qt4-designer
@@ -40,6 +43,9 @@
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global full_python_ver %(%{__python} -c "import sys ; print sys.version[:5]")
 %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")
+%global qt_ver %(%{__python} -c "from PyQt4 import QtCore; print QtCore.QT_VERSION_STR")
+
 
 %description
 eric4 is a full featured Python IDE.
@@ -49,6 +55,7 @@
 %setup -q -a 1 -a 2 -a 3 -a 4 -n %{name}4-%{version}
 
 %patch1 -p1
+%patch2 -p1
 sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
 
 # copy language files
@@ -89,7 +96,6 @@
   echo "%ghost %{_datadir}/eric/$api" >> %{name}-files.list
 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 ||:
@@ -100,6 +106,9 @@
 chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/rhallo.py
 chmod a-x %{buildroot}%{python_sitedir}/eric4/patch_pyxml.py
 
+# add envrionment variables for qt, qt4 and python documentations
+sed -i -e 's|exec|QT4DIR=%{_libdir}/qt4\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=%{_docdir}/qt4/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric4
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -128,6 +137,12 @@
 
 
 %changelog
+* 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
+- init preferences to have relevant qt commands suffix
+- add PyQt4 as Requires
+
 * Tue Jan 29 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.0.4-3
 - requires qt4-designer not qt-designer
 - BR : qt-devel already required by PyQt-devel