Hello community, here is the log from the commit of package eric5 for openSUSE:Factory checked in at 2014-12-01 14:01:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eric5 (Old) and /work/SRC/openSUSE:Factory/.eric5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eric5" Changes: -------- --- /work/SRC/openSUSE:Factory/eric5/eric5.changes 2014-11-02 16:46:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eric5.new/eric5.changes 2014-12-01 14:02:02.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 30 22:05:00 UTC 2014 - [email protected] + +- Update to 5.5.1 + - bug fixes +- add eric5-desktop_encoding.patch + +------------------------------------------------------------------- Old: ---- eric5-5.5.0.tar.gz eric5-i18n-cs-5.5.0.tar.gz eric5-i18n-de-5.5.0.tar.gz eric5-i18n-en-5.5.0.tar.gz eric5-i18n-es-5.5.0.tar.gz eric5-i18n-fr-5.5.0.tar.gz eric5-i18n-it-5.5.0.tar.gz eric5-i18n-ru-5.5.0.tar.gz eric5-i18n-tr-5.5.0.tar.gz eric5-i18n-zh_CN.GB2312-5.5.0.tar.gz New: ---- eric5-5.5.1.tar.gz eric5-desktop_encoding.patch eric5-i18n-cs-5.5.1.tar.gz eric5-i18n-de-5.5.1.tar.gz eric5-i18n-en-5.5.1.tar.gz eric5-i18n-es-5.5.1.tar.gz eric5-i18n-fr-5.5.1.tar.gz eric5-i18n-it-5.5.1.tar.gz eric5-i18n-ru-5.5.1.tar.gz eric5-i18n-tr-5.5.1.tar.gz eric5-i18n-zh_CN.GB2312-5.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric5.spec ++++++ --- /var/tmp/diff_new_pack.VrRVoS/_old 2014-12-01 14:02:04.000000000 +0100 +++ /var/tmp/diff_new_pack.VrRVoS/_new 2014-12-01 14:02:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: eric5 -Version: 5.5.0 +Version: 5.5.1 Release: 0 Summary: Python IDE based on Qt4 License: GPL-3.0+ @@ -34,6 +34,7 @@ Source17: %{name}-i18n-tr-%{version}.tar.gz Source18: %{name}-i18n-zh_CN.GB2312-%{version}.tar.gz Patch0: %{name}-build_compare.patch +Patch1: %{name}-desktop_encoding.patch BuildRequires: fdupes BuildRequires: python3-qscintilla BuildRequires: python3-qt4 @@ -65,6 +66,7 @@ %prep %setup -q -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -n %{name}-%{version} %patch0 +%patch1 # Fix non-executable scripts: sed -i "s|#!/usr/bin/env python3||" eric/{eric5_sqlbrowser,eric5_uipreviewer,Examples/rhallo,eric5_plugininstall,eric5_tray,eric5_pluginrepository,eric5_unittest,eric5_api,eric5,compileUiFiles,eric5_editor,eric5_trpreviewer,eric5_diff,install-i18n,uninstall,eric5_re,install,eric5_webbrowser,eric5_configure,eric5_iconeditor,Examples/hallo,eric5_qregexp,eric5_pluginuninstall,Utilities/crypto/py3AES,eric5_compare,eric5_doc,cleanupSource,eric5_snap,eric5_qregularexpression,Plugins/CheckerPlugins/CodeStyleChecker/pep8,ThirdParty/CharDet/chardet/chardetect}.py @@ -73,7 +75,6 @@ %install python3 install.py -b /usr/bin -d %python3_sitelib -i %{buildroot} -x -%suse_update_desktop_file -i %{name} Development IDE %fdupes %{buildroot}/%{python3_sitelib}/%{name} # fix rpmlint warning chmod +x %{buildroot}/%{python3_sitelib}/%{name}/Utilities/crypto/py3AES.py ++++++ eric5-5.5.0.tar.gz -> eric5-5.5.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/eric5/eric5-5.5.0.tar.gz /work/SRC/openSUSE:Factory/.eric5.new/eric5-5.5.1.tar.gz differ: char 5, line 1 ++++++ eric5-build_compare.patch ++++++ --- /var/tmp/diff_new_pack.VrRVoS/_old 2014-12-01 14:02:04.000000000 +0100 +++ /var/tmp/diff_new_pack.VrRVoS/_new 2014-12-01 14:02:04.000000000 +0100 @@ -1,57 +1,57 @@ ---- install.py.orig 2014-10-28 20:32:46.000000000 -0400 -+++ install.py 2014-10-29 21:18:32.000000000 -0400 -@@ -665,28 +665,28 @@ - apidir = os.path.join(cfg['apidir'], progLanguage.lower()) - if not os.path.exists(apidir): - os.makedirs(apidir) -- for apiName in glob.glob(os.path.join(sourceDir, "APIs", -- progLanguage, "*.api")): -+ for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", -+ progLanguage, "*.api"))): - try: - shutilCopy(apiName, apidir) - except EnvironmentError: - print("Could not install '{0}'.".format(apiName)) -- for apiName in glob.glob(os.path.join(sourceDir, "APIs", -- progLanguage, "*.bas")): -+ for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", -+ progLanguage, "*.bas"))): - try: - shutilCopy(apiName, apidir) - except EnvironmentError: - print("Could not install '{0}'.".format(apiName)) - if progLanguage == "Python": - # copy Python3 API files to the same destination +--- install.py.orig 2014-11-30 17:13:39.605449445 -0500 ++++ install.py 2014-11-30 23:56:31.418435781 -0500 +@@ -701,28 +701,28 @@ + apidir = os.path.join(cfg['apidir'], progLanguage.lower()) + if not os.path.exists(apidir): + os.makedirs(apidir) - for apiName in glob.glob(os.path.join(sourceDir, "APIs", -- "Python3", "*.api")): +- progLanguage, "*.api")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", -+ "Python3", "*.api"))): ++ progLanguage, "*.api"))): try: shutilCopy(apiName, apidir) except EnvironmentError: print("Could not install '{0}'.".format(apiName)) - for apiName in glob.glob(os.path.join(sourceDir, "APIs", -- "Python3", "*.bas")): +- progLanguage, "*.bas")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", -+ "Python3", "*.bas"))): ++ progLanguage, "*.bas"))): try: - if os.path.basename(apiName).startswith("PyQt4"): - # only install the PyQt4 file matching the Qt version -@@ -867,13 +867,13 @@ - + shutilCopy(apiName, apidir) + except EnvironmentError: + print("Could not install '{0}'.".format(apiName)) + if progLanguage == "Python": + # copy Python3 API files to the same destination +- for apiName in glob.glob(os.path.join(sourceDir, "APIs", +- "Python3", "*.api")): ++ for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", ++ "Python3", "*.api"))): + try: + shutilCopy(apiName, apidir) + except EnvironmentError: + print("Could not install '{0}'.".format(apiName)) +- for apiName in glob.glob(os.path.join(sourceDir, "APIs", +- "Python3", "*.bas")): ++ for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", ++ "Python3", "*.bas"))): + try: + if os.path.basename(apiName).startswith("PyQt4"): + # only install the PyQt4 file matching the +@@ -927,13 +927,13 @@ apis = [] - for progLanguage in progLanguages: -- for apiName in glob.glob( -- os.path.join(sourceDir, "APIs", progLanguage, "*.api")): -+ for apiName in sorted(glob.glob( -+ os.path.join(sourceDir, "APIs", progLanguage, "*.api"))): - apis.append(os.path.basename(apiName)) - if progLanguage == "Python": - # treat Python3 API files the same as Python API files + if installApis: + for progLanguage in progLanguages: - for apiName in glob.glob( -- os.path.join(sourceDir, "APIs", "Python3", "*.api")): +- os.path.join(sourceDir, "APIs", progLanguage, "*.api")): + for apiName in sorted(glob.glob( -+ os.path.join(sourceDir, "APIs", "Python3", "*.api"))): ++ os.path.join(sourceDir, "APIs", progLanguage, "*.api"))): apis.append(os.path.basename(apiName)) + if progLanguage == "Python": + # treat Python3 API files the same as Python API files +- for apiName in glob.glob( +- os.path.join(sourceDir, "APIs", "Python3", "*.api")): ++ for apiName in sorted(glob.glob( ++ os.path.join(sourceDir, "APIs", "Python3", "*.api"))): + apis.append(os.path.basename(apiName)) fn = 'eric5config.py' ++++++ eric5-desktop_encoding.patch ++++++ --- install.py.orig 2014-11-30 17:13:39.605449445 -0500 +++ install.py 2014-11-30 23:56:31.418435781 -0500 @@ -230,7 +230,7 @@ if sys.version_info[0] == 2: f = codecs.open(src, "r", "utf-8") else: - f = open(src, "r") + f = open(src, "r", encoding='utf-8') text = f.read() f.close() @@ -239,7 +239,7 @@ if sys.version_info[0] == 2: f = codecs.open(src, "w", "utf-8") else: - f = open(dst, "w") + f = open(dst, "w", encoding='utf-8') f.write(text) f.close() os.chmod(dst, 0o644) ++++++ eric5-i18n-cs-5.5.0.tar.gz -> eric5-i18n-cs-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-de-5.5.0.tar.gz -> eric5-i18n-de-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-en-5.5.0.tar.gz -> eric5-i18n-en-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-es-5.5.0.tar.gz -> eric5-i18n-es-5.5.1.tar.gz ++++++ ++++ 4183 lines of diff (skipped) ++++++ eric5-i18n-fr-5.5.0.tar.gz -> eric5-i18n-fr-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-it-5.5.0.tar.gz -> eric5-i18n-it-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-ru-5.5.0.tar.gz -> eric5-i18n-ru-5.5.1.tar.gz ++++++ ++++ 14782 lines of diff (skipped) ++++++ eric5-i18n-tr-5.5.0.tar.gz -> eric5-i18n-tr-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise ++++++ eric5-i18n-zh_CN.GB2312-5.5.0.tar.gz -> eric5-i18n-zh_CN.GB2312-5.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.5.0/install-i18n.py new/eric5-5.5.1/install-i18n.py --- old/eric5-5.5.0/install-i18n.py 2014-10-27 09:35:30.000000000 +0100 +++ new/eric5-5.5.1/install-i18n.py 2014-11-30 13:08:33.000000000 +0100 @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ [email protected].\n""") + """ [email protected].\n""") raise -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
