Hello community, here is the log from the commit of package rednotebook for openSUSE:Factory checked in at 2017-07-19 11:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rednotebook (Old) and /work/SRC/openSUSE:Factory/.rednotebook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rednotebook" Wed Jul 19 11:21:49 2017 rev:42 rq:510968 version:2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rednotebook/rednotebook.changes 2017-03-10 21:46:18.750391598 +0100 +++ /work/SRC/openSUSE:Factory/.rednotebook.new/rednotebook.changes 2017-07-19 12:22:03.175521148 +0200 @@ -1,0 +2,20 @@ +Sat Jul 15 23:38:18 UTC 2017 - zai...@opensuse.org + +- Update to version 2.0: + + Port to Python 3 and GTK 3. + + Add index of tags to LaTeX export. + + Use new CDN link for MathJax. +- Add rednotebook-locale-unicode-fix.patch: Fix runtime crash, + patches from upstream git. +- Following upstreams porting: Drop python-devel, python-gtk, + python-webkitgtk, python-gtk, python-webkitgtk, python-PyYAML and + python-chardet BuildRequires, Requires and Recommends. +- Add hicolor-icon-theme, pkgconfig, python3-cairo-devel, + python3-gobject-devel and python3-setuptools BuildRequires. +- Add python3-PyYAML and python3-gobject-Gdk Requires, + python3-chardet and python3-pyenchant Recommends. +- Change python macros to python3 variant. +- Drop obsolete conditionals for no longer supported versions of + openSUSE. + +------------------------------------------------------------------- Old: ---- rednotebook-1.15.tar.gz New: ---- rednotebook-2.0.tar.gz rednotebook-locale-unicode-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rednotebook.spec ++++++ --- /var/tmp/diff_new_pack.g9nSaw/_old 2017-07-19 12:22:03.679450039 +0200 +++ /var/tmp/diff_new_pack.g9nSaw/_new 2017-07-19 12:22:03.683449474 +0200 @@ -1,7 +1,7 @@ # # spec file for package rednotebook # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,32 +17,30 @@ Name: rednotebook -Version: 1.15 +Version: 2.0 Release: 0 Summary: Graphical diary and journal +# See note at the end of README: code is using some LGPL-3.0+ module, so the resulting work is GPL-3.0+. License: GPL-3.0+ Group: Productivity/Office/Other -# See note at the end of README: code is using some LGPL-3.0+ module, so the resulting work is GPL-3.0+. Url: http://rednotebook.sourceforge.net/ Source: http://downloads.sourceforge.net/project/rednotebook/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM rednotebook-locale-unicode-fix.patch zai...@opensuse.org -- Fix runtime crash +Patch0: rednotebook-locale-unicode-fix.patch BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-gtk -BuildRequires: python-webkitgtk +BuildRequires: hicolor-icon-theme +BuildRequires: pkgconfig +BuildRequires: python3-cairo-devel +BuildRequires: python3-gobject-devel +BuildRequires: python3-setuptools BuildRequires: update-desktop-files -Requires: python-gtk -Requires: python-webkitgtk -Requires: python-PyYAML -Recommends: python-chardet +Requires: python3-PyYAML +Requires: python3-gobject-Gdk +Recommends: python3-chardet +Recommends: python3-pyenchant Recommends: %{name}-lang -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%py_requires -%if 0%{?suse_version} <= 1110 -%define python_sitelib %{py_sitedir} -%endif %description RedNotebook is a graphical journal to keep track of notes and thoughts. @@ -53,33 +51,23 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %install -%{__python} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot} +%{__python3} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot} %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file %{name} Calendar %fdupes %{buildroot}%{_datadir} -%clean -rm -rf %{buildroot} - %post -%if 0%{?suse_version} > 1130 %desktop_database_post %icon_theme_cache_post -%else -gtk-update-icon-cache %{_datadir}/icons/hicolor || true -%endif %postun -%if 0%{?suse_version} > 1130 %desktop_database_postun %icon_theme_cache_postun -%else -gtk-update-icon-cache %{_datadir}/icons/hicolor || true -%endif %files %defattr(-,root,root) @@ -87,8 +75,8 @@ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.svg -%{python_sitelib}/%{name}/ -%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %dir %{_datadir}/appdata %{_datadir}/appdata/rednotebook.appdata.xml ++++++ rednotebook-1.15.tar.gz -> rednotebook-2.0.tar.gz ++++++ ++++ 8236 lines of diff (skipped) ++++++ rednotebook-locale-unicode-fix.patch ++++++ >From ae67507e47279012becf668df198bf47df8dc70b Mon Sep 17 00:00:00 2001 From: Jendrik Seipp <jendrikse...@gmail.com> Date: Tue, 23 May 2017 08:53:58 +0200 Subject: [PATCH] don't use re.LOCALE for unicode string matching --- rednotebook/external/txt2tags.py | 4 ++-- rednotebook/util/markup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rednotebook/external/txt2tags.py b/rednotebook/external/txt2tags.py index 37f5369b..8564bd65 100644 --- a/rednotebook/external/txt2tags.py +++ b/rednotebook/external/txt2tags.py @@ -1969,10 +1969,10 @@ def getRegexes(): bank['linkmark'] = re.compile( r'\[(?P<label>%s|[^]]+) (?P<link>%s|%s|%s)\]'%( patt_img, retxt_url, patt_email, retxt_url_local), - re.L+re.I) + re.I) # Image - bank['img'] = re.compile(patt_img, re.L+re.I) + bank['img'] = re.compile(patt_img, re.I) # Special things bank['special'] = re.compile(r'^%!\s*') diff --git a/rednotebook/util/markup.py b/rednotebook/util/markup.py index 3362f626..2067d77e 100644 --- a/rednotebook/util/markup.py +++ b/rednotebook/util/markup.py @@ -41,7 +41,7 @@ # named local link [my file.txt ""file:///home/user/my file.txt""] # named link in web [heise ""http://heise.de"";] -REGEX_NAMED_LINK = re.compile(r'(\[)(.*?)(\s"")(\S.*?\S)(""\])', flags=re.I | re.L) +REGEX_NAMED_LINK = re.compile(r'(\[)(.*?)(\s"")(\S.*?\S)(""\])', flags=re.I) ESCAPE_COLOR = r'XBEGINCOLORX\1XSEPARATORX\2XENDCOLORX' COLOR_ESCAPED = r'XBEGINCOLORX(.*?)XSEPARATORX(.*?)XENDCOLORX' >From 8c32272c779fc7465247cf62902703afe39d4158 Mon Sep 17 00:00:00 2001 From: Jendrik Seipp <jendrikse...@gmail.com> Date: Tue, 23 May 2017 17:55:28 +0200 Subject: [PATCH] remove remaining uses of re.L and re.U --- rednotebook/data.py | 2 +- rednotebook/external/txt2tags.py | 2 +- rednotebook/gui/t2t_highlight.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rednotebook/data.py b/rednotebook/data.py index 49d8551a..42fa7c09 100644 --- a/rednotebook/data.py +++ b/rednotebook/data.py @@ -31,7 +31,7 @@ HASHTAG_PATTERN = ( r'(^|[^%(ALPHA_NUMERIC)s&#])(#|\uFF03)(?!%(HASHTAG_EXCLUDES)s)' '(%(HASHTAG_TEXT)s)' % locals()) -HASHTAG = re.compile(HASHTAG_PATTERN, flags=re.I | re.U) +HASHTAG = re.compile(HASHTAG_PATTERN, flags=re.I) def escape_tag(tag): diff --git a/rednotebook/external/txt2tags.py b/rednotebook/external/txt2tags.py index 8564bd65..38482a7b 100644 --- a/rednotebook/external/txt2tags.py +++ b/rednotebook/external/txt2tags.py @@ -4367,7 +4367,7 @@ def compile_filters(filters, errmsg='Filter'): for i in range(len(filters)): patt,repl = filters[i] ## JS: Make filters Unicode-aware. - try: rgx = re.compile(patt, re.U) + try: rgx = re.compile(patt) except: Error("%s: '%s'"%(errmsg, patt)) filters[i] = (rgx,repl) return filters diff --git a/rednotebook/gui/t2t_highlight.py b/rednotebook/gui/t2t_highlight.py index bdb173c7..b126c83f 100644 --- a/rednotebook/gui/t2t_highlight.py +++ b/rednotebook/gui/t2t_highlight.py @@ -65,11 +65,11 @@ def __init__(self, pattern_or_regex, group_tag_pairs, flags="", if isinstance(pattern_or_regex, str): # assemble re-flag # TODO: Is this needed? - flags += "ML" + flags += "M" flag = 0 for char in flags: - assert char in 'MLSIUX' + assert char in 'MSIUX' flag |= getattr(re, char) self._regexp = re.compile(pattern_or_regex, flag)
