rpms/eric/F-7 eric.spec,1.12,1.13
Johan Cwiklinski (trasher)
fedora-extras-commits at redhat.com
Fri Jan 25 12:14:23 UTC 2008
- Previous message (by thread): rpms/groff/F-7 groff.spec,1.51,1.52 nroff,1.4,1.5
- Next message (by thread): rpms/nspr/devel .cvsignore, 1.11, 1.12 nspr.spec, 1.26, 1.27 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: trasher
Update of /cvs/extras/rpms/eric/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18700
Modified Files:
eric.spec
Log Message:
Bug #200856 : incorrect paths for docs and qt4
Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-7/eric.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eric.spec 15 Jan 2008 18:38:21 -0000 1.12
+++ eric.spec 25 Jan 2008 12:13:47 -0000 1.13
@@ -2,10 +2,12 @@
# Fedora review
# http://bugzilla.redhat.com/186919
+%define qt_ver 3.3.8
+
Name: eric
Summary: Python IDE
Version: 3.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Development/Tools
@@ -26,13 +28,18 @@
BuildRequires: desktop-file-utils
BuildRequires: PyQt-qscintilla-devel
-# PyQt api's
-BuildRequires: PyQt-devel
# This can be left unversioned
Requires: PyQt-qscintilla
+# Need this for the documentation
+Requires: python-docs
+Requires: qt-designer
+Requires: qt4-doc
+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 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"
@@ -50,6 +57,7 @@
%patch2 -p1
sed -i -e "s|@APIDIR@|%{_datadir}/eric|" eric/Preferences/__init__.py
+
# copy language files
mv %{name}-%{version}/%{name}/i18n/*.qm %{name}/i18n/
mv %{name}-%{version}/%{name}/i18n/*.ts %{name}/i18n/
@@ -100,6 +108,8 @@
chmod a+x %{buildroot}%{python_sitedir}/eric3/DebugClients/Python/PyCoverage.py
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
%post
@@ -129,6 +139,11 @@
%changelog
+* 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
+- BR: PyQt-devel is already needeed by PyQt-qscintilla-devel
+
* Fri Jan 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.9.5-1
- Rebuild for last version
- Include the translation files
- Previous message (by thread): rpms/groff/F-7 groff.spec,1.51,1.52 nroff,1.4,1.5
- Next message (by thread): rpms/nspr/devel .cvsignore, 1.11, 1.12 nspr.spec, 1.26, 1.27 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list