From 673cdc3da59ad95b450b9ef7efe926863e120272 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Feb 10 2017 09:52:11 +0000 Subject: Update to version 2.5.2 --- diff --git a/.gitignore b/.gitignore index 92781ac..7c82511 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /2.3.tar.gz /2.4.tar.gz /2.5.tar.gz +/powerline-2.5.2.tar.gz diff --git a/powerline-2.6-workaround_terminal_with_wide_unicode_chars.patch b/powerline-2.6-workaround_terminal_with_wide_unicode_chars.patch deleted file mode 100644 index e4a76fb..0000000 --- a/powerline-2.6-workaround_terminal_with_wide_unicode_chars.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 373952684ac26a1604d5e9d99783c6139ea72a6c Mon Sep 17 00:00:00 2001 -From: Foo -Date: Sat, 29 Oct 2016 15:37:01 +0300 -Subject: [PATCH] Provide another default theme with less troublesome - characters - -Ref #1652 ---- - docs/source/configuration/reference.rst | 5 +- - powerline/__init__.py | 2 +- - powerline/config_files/themes/powerline.json | 8 +- - .../config_files/themes/powerline_terminus.json | 146 +++++++++++++++++++++ - 4 files changed, 154 insertions(+), 7 deletions(-) - create mode 100644 powerline/config_files/themes/powerline_terminus.json - -Index: powerline-2.5/docs/source/configuration/reference.rst -=================================================================== ---- powerline-2.5.orig/docs/source/configuration/reference.rst -+++ powerline-2.5/docs/source/configuration/reference.rst -@@ -143,9 +143,9 @@ Common configuration is a subdictionary - .. _config-common-default_top_theme: - - ``default_top_theme`` -- String, determines which top-level theme will be used as the default. -- Defaults to ``powerline`` in unicode locales and ``ascii`` in non-unicode -- locales. See `Themes`_ section for more details. -+ String, determines which top-level theme will be used as the default. -+ Defaults to ``powerline_terminus`` in unicode locales and ``ascii`` in -+ non-unicode locales. See `Themes`_ section for more details. - - Extension-specific configuration - -------------------------------- -@@ -329,6 +329,7 @@ powerline_unicode7 Theme with p - unicode Theme without any symbols from private use area - unicode_terminus Theme containing only symbols from terminus PCF font - unicode_terminus_condensed Like above, but occupies as less space as possible -+powerline_terminus Like unicode_terminus, but with powerline symbols - ascii Theme without any unicode characters at all - ========================== ==================================================== - -Index: powerline-2.5/powerline/__init__.py -=================================================================== ---- powerline-2.5.orig/powerline/__init__.py -+++ powerline-2.5/powerline/__init__.py -@@ -310,7 +310,7 @@ def finish_common_config(encoding, commo - ''' - encoding = encoding.lower() - if encoding.startswith('utf') or encoding.startswith('ucs'): -- default_top_theme = 'powerline' -+ default_top_theme = 'powerline_terminus' - else: - default_top_theme = 'ascii' - -Index: powerline-2.5/powerline/config_files/themes/powerline.json -=================================================================== ---- powerline-2.5.orig/powerline/config_files/themes/powerline.json -+++ powerline-2.5/powerline/config_files/themes/powerline.json -@@ -117,10 +117,10 @@ - }, - "powerline.segments.vim.visual_range": { - "args": { -- "CTRL_V_text": "{rows} × {vcols}", -- "v_text_oneline": "C:{vcols}", -- "v_text_multiline": "L:{rows}", -- "V_text": "L:{rows}" -+ "CTRL_V_text": "↕{rows} ↔{vcols}", -+ "v_text_oneline": "↔{vcols}", -+ "v_text_multiline": "↕{rows}", -+ "V_text": "⇕{rows}" - } - }, - "powerline.segments.vim.readonly_indicator": { -Index: powerline-2.5/powerline/config_files/themes/powerline_terminus.json -=================================================================== ---- /dev/null -+++ powerline-2.5/powerline/config_files/themes/powerline_terminus.json -@@ -0,0 +1,146 @@ -+{ -+ "dividers": { -+ "left": { -+ "hard": " ", -+ "soft": " " -+ }, -+ "right": { -+ "hard": " ", -+ "soft": " " -+ } -+ }, -+ "spaces": 1, -+ "segment_data": { -+ "branch": { -+ "before": " " -+ }, -+ "stash": { -+ "before": "ST " -+ }, -+ "cwd": { -+ "args": { -+ "ellipsis": "…" -+ } -+ }, -+ -+ "line_current_symbol": { -+ "contents": " " -+ }, -+ "player": { -+ "args": { -+ "state_symbols": { -+ "fallback": "♫", -+ "play": "▶", -+ "pause": "▮▮", -+ "stop": "■" -+ } -+ } -+ }, -+ -+ "time": { -+ "before": "" -+ }, -+ -+ "powerline.segments.common.net.network_load": { -+ "args": { -+ "recv_format": "⇓ {value:>8}", -+ "sent_format": "⇑ {value:>8}" -+ } -+ }, -+ "powerline.segments.common.net.hostname": { -+ "before": " " -+ }, -+ "powerline.segments.common.bat.battery": { -+ "args": { -+ "full_heart": "♥", -+ "empty_heart": "♥", -+ "online": "⚡︎", -+ "offline": " " -+ } -+ }, -+ "powerline.segments.common.sys.uptime": { -+ "before": "↑ " -+ }, -+ "powerline.segments.common.mail.email_imap_alert": { -+ "before": "MAIL " -+ }, -+ "powerline.segments.common.env.virtualenv": { -+ "before": "(e) " -+ }, -+ "powerline.segments.common.wthr.weather": { -+ "args": { -+ "icons": { -+ "day": "DAY", -+ "blustery": "WIND", -+ "rainy": "RAIN", -+ "cloudy": "CLOUDS", -+ "snowy": "SNOW", -+ "stormy": "STORM", -+ "foggy": "FOG", -+ "sunny": "SUN", -+ "night": "NIGHT", -+ "windy": "WINDY", -+ "not_available": "NA", -+ "unknown": "UKN" -+ } -+ } -+ }, -+ "powerline.segments.common.time.fuzzy_time": { -+ "args": { -+ "unicode_text": true -+ } -+ }, -+ -+ "powerline.segments.vim.mode": { -+ "args": { -+ "override": { -+ "n": "NORMAL", -+ "no": "N·OPER", -+ "v": "VISUAL", -+ "V": "V·LINE", -+ "^V": "V·BLCK", -+ "s": "SELECT", -+ "S": "S·LINE", -+ "^S": "S·BLCK", -+ "i": "INSERT", -+ "R": "RPLACE", -+ "Rv": "V·RPLC", -+ "c": "COMMND", -+ "cv": "VIM·EX", -+ "ce": "NRM·EX", -+ "r": "PROMPT", -+ "rm": "-MORE-", -+ "r?": "CNFIRM", -+ "!": "!SHELL" -+ } -+ } -+ }, -+ "powerline.segments.vim.visual_range": { -+ "args": { -+ "CTRL_V_text": "↕{rows} ↔{vcols}", -+ "v_text_oneline": "↔{vcols}", -+ "v_text_multiline": "↕{rows}", -+ "V_text": "⇕{rows}" -+ } -+ }, -+ "powerline.segments.vim.readonly_indicator": { -+ "args": { -+ "text": "" -+ } -+ }, -+ "powerline.segments.vim.modified_indicator": { -+ "args": { -+ "text": "+" -+ } -+ }, -+ -+ "powerline.segments.i3wm.scratchpad": { -+ "args": { -+ "icons": { -+ "fresh": "●", -+ "changed": "○" -+ } -+ } -+ } -+ } -+} diff --git a/powerline.spec b/powerline.spec index e1b57e7..845b27e 100644 --- a/powerline.spec +++ b/powerline.spec @@ -1,6 +1,6 @@ Name: powerline -Version: 2.5 -Release: 4%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Summary: The ultimate status-line/prompt utility License: MIT @@ -23,11 +23,10 @@ Requires(postun): systemd Recommends: python3-pygit2 -Source0: https://github.com/powerline/powerline/archive/%{version}.tar.gz +Source0: https://github.com/powerline/powerline/archive/%{version}/powerline-%{version}.tar.gz Source1: vim-powerline.metainfo.xml Patch0: powerline-py2v3-fix.patch -Patch1: powerline-2.6-workaround_terminal_with_wide_unicode_chars.patch %description Powerline is a status-line plugin for vim, and provides status-lines and prompts @@ -329,6 +328,14 @@ install -m 0644 powerline/dist/systemd/powerline-daemon.service %{buildroot}%{_u %{_datadir}/tmux/powerline*.conf %changelog +* Fri Feb 10 2017 Andreas Schneider - 2.5.2-1 +- Update to version 2.5.2 + o Fixed ipython-5.2* support. + o Made more robust theme default. + o Made it use hglib in place of unstable mercurial plugin API. + o Fixed latest fish version support. + o Some other fixes and documentation adjustments. + * Wed Dec 21 2016 Andreas Schneider - 2.5-4 - Add upstream work around for gnome-terminal issues, brc#1403133 - Make pygit a recommondation diff --git a/sources b/sources index 8625909..35234ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2abb1b71f00f67f9d7a8fc9747374d1f 2.5.tar.gz +SHA512 (powerline-2.5.2.tar.gz) = ef85092de4b8c4f70fe2b41c54b2d7844f0d2b4decec78f51d49ccedbfce21a68e26c87ebf24e355bbc7eac2c7b60201edd16a28dc220cd526216a6659d0eb1d