[eric] 4.5.10-1

Rex Dieter rdieter at fedoraproject.org
Tue Apr 23 17:30:31 UTC 2013 

commit 7c54d9ad4479b6d29e91c80a49967feee9510e23
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Apr 23 12:30:27 2013 -0500

    4.5.10-1
    
    - eric4-4.5.10
    - fix License
    - cleanup .spec

 .gitignore                       |   20 +++++++-------
 eric.spec                        |   53 ++++++++------------------------------
 eric4-4.4.13-shebang.patch       |   16 -----------
 eric4-4.4.19-no_patchPyXML.patch |   32 -----------------------
 sources                          |   20 +++++++-------
 5 files changed, 31 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abc57b7..e8602a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,3 @@
-/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
 /eric4-4.4.19.tar.gz
 /eric4-i18n-cs-4.4.19.tar.gz
 /eric4-i18n-de-4.4.19.tar.gz
@@ -18,3 +8,13 @@
 /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
+/eric4-4.5.10.tar.gz
+/eric4-i18n-cs-4.5.10.tar.gz
+/eric4-i18n-de-4.5.10.tar.gz
+/eric4-i18n-en-4.5.10.tar.gz
+/eric4-i18n-es-4.5.10.tar.gz
+/eric4-i18n-fr-4.5.10.tar.gz
+/eric4-i18n-it-4.5.10.tar.gz
+/eric4-i18n-ru-4.5.10.tar.gz
+/eric4-i18n-tr-4.5.10.tar.gz
+/eric4-i18n-zh_CN.GB2312-4.5.10.tar.gz
diff --git a/eric.spec b/eric.spec
index 76b668f..30376e0 100644
--- a/eric.spec
+++ b/eric.spec
@@ -4,18 +4,12 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.4.19
-Release: 5%{?dist}
+Version: 4.5.10
+Release: 1%{?dist}
 
-License: GPL3+
-Group:   Development/Tools
+License: GPLv3+
 URL:     http://eric-ide.python-projects.org
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
-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
@@ -38,18 +32,7 @@ BuildRequires: python
 Requires: PyQt4 PyQt4-webkit
 Requires: qscintilla-python
 
-## FIXME: get PyXML patched per eric/README-PyXML.txt
-## see https://bugzilla.redhat.com/767737 
-# Reading hte code, if PyXML isn't installed, we should fallback to using
-# a non-validating parser.  That shouldn't break things with good
-# project/config files but it means we can't catch non-conforming xml files
-# Can bug upstream to port to a different library than PyXML to regain
-# validation of those files
-#BuildRequires: PyXML
-#Requires: PyXML
-
-
-# Need this for the documentation
+# for documentation
 Requires: python-docs
 Requires: qt4-designer
 
@@ -68,9 +51,6 @@ eric4 is a full featured Python IDE.
 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
 
@@ -80,7 +60,6 @@ sed -i -e 's|"QtToolsPostfix4" : "",|"QtToolsPostfix4" : "-qt4",|' eric/Preferen
 
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}/
 
 %{__python} install.py \
@@ -88,7 +67,7 @@ mkdir -p %{buildroot}/
   -b %{_bindir} \
   -d %{python_sitedir}
 
-#we have to correct api path to remove %{builddir}
+# correct api path to remove %{builddir}
 sed -i -e 's|%{buildroot}||' %{buildroot}%{python_sitedir}/eric4config.py
 
 desktop-file-install \
@@ -111,14 +90,6 @@ for api in $PyQt4_apis $PyKDE_apis ; do
   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 ||:
-chmod a+x %{buildroot}%{python_sitedir}/eric4/uninstall.py
-chmod a+x %{buildroot}%{python_sitedir}/eric4/Examples/hallo.py
-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)
@@ -139,28 +110,26 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
-
-%clean
-rm -rf %{buildroot}
-
-
 %files -f %{name}-files.list
-%defattr(-,root,root,-)
 %doc eric/README* THANKS LICENSE.GPL3
 %{_bindir}/eric4*
 %{python_sitedir}/eric4config.py*
 %{python_sitedir}/eric4/
 %{python_sitedir}/eric4plugins/
 %{python_sitedir}/eric4.pth
-
 %dir %{_datadir}/eric/
 %{_datadir}/applications/*eric4.desktop
 %{_datadir}/icons/hicolor/*/*/*
-
 %{_libdir}/qt4/qsci/api/python/*.api
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
+
 %changelog
+* Tue Apr 23 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.5.10-1
+- eric4-4.5.10
+- fix License
+- cleanup .spec
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.19-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 150af9b..1044720 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,10 @@
-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
+9fe7a1889b28619f9e51b10f19c81bd7  eric4-4.5.10.tar.gz
+6f3f19ce5a8a42ffaeab8eb221285891  eric4-i18n-cs-4.5.10.tar.gz
+c9c5eae078b0db29ab38eef7232d41f3  eric4-i18n-de-4.5.10.tar.gz
+927a26bb8bc9b606cf1f6dbb85686631  eric4-i18n-en-4.5.10.tar.gz
+59470097a6a25d29c7237907427bb782  eric4-i18n-es-4.5.10.tar.gz
+b53800a6b90d964b7f1cecc347e9aaed  eric4-i18n-fr-4.5.10.tar.gz
+f68075ed4a2035e7fa22bda5e5d226b2  eric4-i18n-it-4.5.10.tar.gz
+3725a4a7fd93682fa1c49f3455973a0e  eric4-i18n-ru-4.5.10.tar.gz
+d1f99ebd1582f3a09c013d76961141fb  eric4-i18n-tr-4.5.10.tar.gz
+10af42efa41db6385ed3f7f7bbc207dd  eric4-i18n-zh_CN.GB2312-4.5.10.tar.gz

More information about the scm-commits mailing list