[eric] 4.4.15

Rex Dieter rdieter at fedoraproject.org
Sat Jun 18 13:53:00 UTC 2011 

commit 567c0a30febad15f749e1379ef1f471ce30cc399
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jun 18 08:57:27 2011 -0500

    4.4.15

 .gitignore |   10 ++++++++++
 eric.spec  |   50 +++++++++++++++++++++++---------------------------
 sources    |   19 ++++++++++---------
 3 files changed, 43 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46382e2..649c866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,13 @@
 /eric4-i18n-ru-4.4.14.tar.gz
 /eric4-i18n-tr-4.4.14.tar.gz
 /eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz
+/eric4-4.4.15.tar.gz
+/eric4-i18n-cs-4.4.15.tar.gz
+/eric4-i18n-de-4.4.15.tar.gz
+/eric4-i18n-en-4.4.15.tar.gz
+/eric4-i18n-es-4.4.15.tar.gz
+/eric4-i18n-fr-4.4.15.tar.gz
+/eric4-i18n-it-4.4.15.tar.gz
+/eric4-i18n-ru-4.4.15.tar.gz
+/eric4-i18n-tr-4.4.15.tar.gz
+/eric4-i18n-zh_CN.GB2312-4.4.15.tar.gz
diff --git a/eric.spec b/eric.spec
index 7311ac4..e36b39f 100644
--- a/eric.spec
+++ b/eric.spec
@@ -1,13 +1,10 @@
 
-# Fedora review
-# http://bugzilla.redhat.com/186919
-
 # avoid empty debuginfo package
 %define debug_package %{nil}
 
 Name:    eric
 Summary: Python IDE
-Version: 4.4.14
+Version: 4.4.15
 Release: 1%{?dist}
 
 License: GPL3+
@@ -18,53 +15,54 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: eric4-4.4.13-shebang.patch
 
-Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
 Source2: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-de-%{version}.tar.gz
-Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
-Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz
-Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-es-%{version}.tar.gz
-Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-%{version}.tar.gz
-Source7: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-zh_CN.GB2312-%{version}.tar.gz 
-Source8: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-it-%{version}.tar.gz
+Source3: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-en-%{version}.tar.gz
+Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-es-%{version}.tar.gz
+Source5: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-fr-%{version}.tar.gz
+Source6: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-it-%{version}.tar.gz
+Source7: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-ru-%{version}.tar.gz
+Source8: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-%{version}.tar.gz
+Source9: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-zh_CN.GB2312-%{version}.tar.gz 
 Source10: eric4.desktop
 
 Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
-BuildRequires: qscintilla-python-devel
 BuildRequires: qscintilla-python
 BuildRequires: python
 
 # This can be left unversioned
 Requires: qscintilla-python
 
+## FIXME: update or patch PyXML per eric/README-PyXML.txt
+BuildRequires: PyXML >= 0.8.6
+Requires: PyXML >= 0.8.6
+
 # Need this for the documentation
 Requires: python-docs
 Requires: qt4-designer
-# wow, at 80mb+, are we sure we want this?  -- Rex
-#Doc is optionnal, we can remove -- Johan
-#Requires: qt4-doc
 
 %global 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()")
 %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.
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -n %{name}4-%{version}
+%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -n eric4-%{version}
 
 # copy language files
 mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
-
 rm -rf %{name}-%{version}
 
 %patch1 -p1 -b .shebang
 
+# add qt4 suffix
+sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' eric/Preferences/__init__.py
+
 
 %build
 # Empty build
@@ -74,9 +72,6 @@ rm -rf %{name}-%{version}
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/
 
-#path to install api files // As of 4.3.1 release, this is no longer required
-#sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py
-
 %{__python} install.py \
   -i %{buildroot}/ \
   -b %{_bindir} \
@@ -86,7 +81,7 @@ mkdir -p %{buildroot}/
 sed -i -e 's|%{buildroot}||' %{buildroot}%{python_sitedir}/eric4config.py
 
 desktop-file-install \
-  --dir %{buildroot}/%{_datadir}/applications/ \
+  --dir %{buildroot}%{_datadir}/applications/ \
   --vendor="" \
   %{SOURCE10}
 
@@ -94,7 +89,6 @@ install -m644 -p -D \
   %{buildroot}%{python_sitedir}/eric4/icons/default/eric.png \
   %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png
 
-
 ## generate api files
 mkdir -p %{buildroot}%{_datadir}/eric/
 
@@ -115,13 +109,12 @@ chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/rhallo.py
 chmod a-x %{buildroot}%{python_sitedir}/eric4/patch_pyxml.py
 
 # add envrionment variables for documentations
+# FIXME: try to query for some of these at runtime, instead of setting a static value @ buildtime
+# e.g. %_libdir/pkgconfig/Qt.pc has these, but it's currently in qt-devel (rats)
 sed -i -e \
   's|exec|QT4DIR=%{_qt4_prefix}\nPYTHONDOCDIR=%{_docdir}/python-docs-%{?python_ver}/html\nQT4DOCDIR=%{_qt4_docdir}/html\nPYQT4DOCDIR=%{_docdir}/PyQt4-devel-%{?pyqt_ver}/html\nexport QT4DIR PYTHONDOCDIR QT4DOCDIR PYQT4DOCDIR\n&|' \
   %{buildroot}%{_bindir}/eric4
 
-# add qt4 suffix
-sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' %{buildroot}%{python_sitedir}/eric4/Preferences/__init__.py
-
 
 %post 
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -157,6 +150,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Sat Jun 18 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.15-1
+- 4.4.15
+
 * Mon May 09 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.14-1
 - 4.4.14
 
diff --git a/sources b/sources
index 062ea97..1efb28f 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,10 @@
-dc8d56fa68c0011633502fdc094fc04e  eric4-4.4.14.tar.gz
-958db16330063666427ff572426b4ba9  eric4-i18n-cs-4.4.14.tar.gz
-831e19dbd458a30512f6a872459cc1ed  eric4-i18n-de-4.4.14.tar.gz
-3c8028b7e7360b8e55dec2b0504755a6  eric4-i18n-es-4.4.14.tar.gz
-999ccb409ca9d23d741d88a0cb1ccbc1  eric4-i18n-fr-4.4.14.tar.gz
-60380437ecbd0052c9d2b19dd511f8b0  eric4-i18n-it-4.4.14.tar.gz
-0fc7a0766fc700dfc362f7b3a847894c  eric4-i18n-ru-4.4.14.tar.gz
-06c90343b5dccf4e3720df40f8785e57  eric4-i18n-tr-4.4.14.tar.gz
-eb25d5e34f983394261f252e0775a3c2  eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz
+d2862c46e563d89ee93a1d30a57fe115  eric4-4.4.15.tar.gz
+5a2d1af951e51e15339943ddf1faacad  eric4-i18n-cs-4.4.15.tar.gz
+c26b8702c5f29e028be30990b4902168  eric4-i18n-de-4.4.15.tar.gz
+4d50c07a8d49bb32eaa8517cb788c151  eric4-i18n-en-4.4.15.tar.gz
+eb20966d240d30f50a9b4ff59d1dd7a1  eric4-i18n-es-4.4.15.tar.gz
+3848dfc9fa80eab56eadc4064a2a6101  eric4-i18n-fr-4.4.15.tar.gz
+dca90a7a72830ba327060fa3e01b1ca2  eric4-i18n-it-4.4.15.tar.gz
+a851eea3bb27992d944fabae81445093  eric4-i18n-ru-4.4.15.tar.gz
+9a29bd8758558e85bf57ff49290c1a96  eric4-i18n-tr-4.4.15.tar.gz
+436a2a5e1990b68e2801f47292a97d17  eric4-i18n-zh_CN.GB2312-4.4.15.tar.gz

More information about the scm-commits mailing list