rpms/eric/F-7 eric.spec,1.13,1.14

[Johan Cwiklinski (trasher)]

Author: trasher

Update of /cvs/extras/rpms/eric/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18472

Modified Files:
	eric.spec 
Log Message:
- full python version were not correctly set
- generate QT4DIR and QT4DOCDIR at runtime



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-7/eric.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eric.spec	25 Jan 2008 12:13:47 -0000	1.13
+++ eric.spec	28 Apr 2008 20:32:24 -0000	1.14
@@ -7,7 +7,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 3.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -39,7 +39,7 @@
 Requires: qt4-devel
 
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
-%global full_python_ver %(%{__python} -c "import sys ; print sys.version[:5]")
+%global full_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()")
 ## python >=2.4 automatically uses python(abi)
 %if "%{?python_ver}" > "1" && "%{?python_ver}" < "2.4"
@@ -109,7 +109,7 @@
 chmod a+x %{buildroot}%{python_sitedir}/eric3/Examples/rhallo.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\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric3
+sed -i -e 's|exec|QT4DIR=`pkg-config --variable=docdir Qt`\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?full_python_ver}/html\nQTDOCDIR=%{_docdir}/qt-devel-%{?qt_ver}/html\nQT4DOCDIR=`pkg-config --variable=docdir Qt`/html\nexport QT4DIR PYTHONDOCDIR QTDOCDIR QT4DOCDIR\n&|' %{buildroot}%{_bindir}/eric3
 
 
 %post
@@ -139,6 +139,10 @@
 
 
 %changelog
+* Mon Apr 28 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.9.5-3
+- full python version were not correctly set
+- generate QT4DIR and QT4DOCDIR at runtime
+
 * Thu Jan 17 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.9.5-2
 - Add environment variable to set python, qt4 and qt docs path (bug #200856)
 - Requires python-doc, qt-designer, qt4-devel and qt4-doc