[eric] 4.4.19 Requires: PyQt4 PyQt4-webkit

Rex Dieter rdieter at fedoraproject.org
Wed Dec 14 19:20:51 UTC 2011


commit 5138004bd47ad8e99ba7a78423bdb0a139da53ad
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 14 13:20:42 2011 -0600

    4.4.19
    Requires: PyQt4 PyQt4-webkit

 .gitignore |   19 ++++++++++---------
 eric.spec  |   19 ++++++++++++++-----
 sources    |   20 ++++++++++----------
 3 files changed, 34 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 649c866..abc57b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,3 @@
-/eric4-4.4.14.tar.gz
-/eric4-i18n-cs-4.4.14.tar.gz
-/eric4-i18n-de-4.4.14.tar.gz
-/eric4-i18n-es-4.4.14.tar.gz
-/eric4-i18n-fr-4.4.14.tar.gz
-/eric4-i18n-it-4.4.14.tar.gz
-/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
@@ -17,3 +8,13 @@
 /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
+/eric4-4.4.19.tar.gz
+/eric4-i18n-cs-4.4.19.tar.gz
+/eric4-i18n-de-4.4.19.tar.gz
+/eric4-i18n-en-4.4.19.tar.gz
+/eric4-i18n-es-4.4.19.tar.gz
+/eric4-i18n-fr-4.4.19.tar.gz
+/eric4-i18n-it-4.4.19.tar.gz
+/eric4-i18n-ru-4.4.19.tar.gz
+/eric4-i18n-tr-4.4.19.tar.gz
+/eric4-i18n-zh_CN.GB2312-4.4.19.tar.gz
diff --git a/eric.spec b/eric.spec
index e36b39f..5dda59f 100644
--- a/eric.spec
+++ b/eric.spec
@@ -4,7 +4,7 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.4.15
+Version: 4.4.19
 Release: 1%{?dist}
 
 License: GPL3+
@@ -14,6 +14,8 @@ Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{versio
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: eric4-4.4.13-shebang.patch
+# this is rpmbuild, don't wait on interactive feedback
+Patch2: eric4-4.4.19-no_patchPyXML.patch
 
 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
@@ -29,15 +31,17 @@ Source10: eric4.desktop
 Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
+BuildRequires: PyQt4 PyQt4-webkit
 BuildRequires: qscintilla-python
 BuildRequires: python
 
-# This can be left unversioned
+Requires: PyQt4 PyQt4-webkit
 Requires: qscintilla-python
 
-## FIXME: update or patch PyXML per eric/README-PyXML.txt
-BuildRequires: PyXML >= 0.8.6
-Requires: PyXML >= 0.8.6
+## FIXME: get PyXML patched per eric/README-PyXML.txt
+## see https://bugzilla.redhat.com/767737 
+BuildRequires: PyXML
+Requires: PyXML
 
 # Need this for the documentation
 Requires: python-docs
@@ -59,6 +63,7 @@ mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
 rm -rf %{name}-%{version}
 
 %patch1 -p1 -b .shebang
+%patch2 -p1 -b .no_patchPyXML
 
 # add qt4 suffix
 sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' eric/Preferences/__init__.py
@@ -150,6 +155,10 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Wed Dec 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.19-1
+- 4.4.19
+- Requires: PyQt4 PyQt4-webkit
+
 * Sat Jun 18 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.15-1
 - 4.4.15
 
diff --git a/sources b/sources
index 1efb28f..150af9b 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,10 @@
-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
+58ac6cb0f0af79b07f0b95421dc89f53  eric4-4.4.19.tar.gz
+93587a3fb9e410caad49841990903758  eric4-i18n-cs-4.4.19.tar.gz
+173bb1d03e9a4ba519becd53104ef0b8  eric4-i18n-de-4.4.19.tar.gz
+b4f59ed35d901054fff0ffac163bf136  eric4-i18n-en-4.4.19.tar.gz
+3d0603830d07e4692fe3910ee42ed3fe  eric4-i18n-es-4.4.19.tar.gz
+836d523abffadb65f9e88bdb7de4678c  eric4-i18n-fr-4.4.19.tar.gz
+f5de37ddc7c787b4f7d14d9c8c60c6ec  eric4-i18n-it-4.4.19.tar.gz
+c411904c39821a6b864d20589454f23c  eric4-i18n-ru-4.4.19.tar.gz
+72d22df7f5c8fc46026f23783725a9da  eric4-i18n-tr-4.4.19.tar.gz
+82507dd96da150a11593bf75314592ba  eric4-i18n-zh_CN.GB2312-4.4.19.tar.gz


More information about the scm-commits mailing list