diff --git a/.gitignore b/.gitignore index b5ab1f1..44a9b52 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /70a94ee7d39a0958a06436aaeba05bd830830cc8.tar.gz /9e7c6cf0bed52e47451c81377b5a1a96366b053f.tar.gz /1.3.tar.gz +/1.3.1.tar.gz diff --git a/0001-lib-Remove-wrong-shebang-from-debug.py.patch b/0001-lib-Remove-wrong-shebang-from-debug.py.patch deleted file mode 100644 index 3a7c0ec..0000000 --- a/0001-lib-Remove-wrong-shebang-from-debug.py.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9281f4a6c42bc217c7e657d3abff3597cbe26355 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 2 Dec 2014 20:39:21 +0100 -Subject: [PATCH] lib: Remove wrong shebang from debug.py. - -Signed-off-by: Andreas Schneider ---- - powerline/lib/debug.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/powerline/lib/debug.py b/powerline/lib/debug.py -index fc1ffee..515e8c4 100755 ---- a/powerline/lib/debug.py -+++ b/powerline/lib/debug.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # vim:fileencoding=utf-8:noet - from __future__ import (unicode_literals, division, absolute_import, print_function) - --- -2.1.2 - diff --git a/0001-setup-Honor-CFLAGS-set-as-environment-variable.patch b/0001-setup-Honor-CFLAGS-set-as-environment-variable.patch new file mode 100644 index 0000000..9094a41 --- /dev/null +++ b/0001-setup-Honor-CFLAGS-set-as-environment-variable.patch @@ -0,0 +1,32 @@ +From 0307d7c229cda63a55bc53ccb7a71fd62a669bdf Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Tue, 9 Dec 2014 09:32:05 +0100 +Subject: [PATCH] setup: Honor CFLAGS set as environment variable + +Distributions normally have their preferred set of CFLAGS so the +binaries are optimized and include debug symbols to create a debuginfo +package. For this we need to be able to set the CFLAGS via the +commandline and the setup.py should forward them to the compiler. + +Signed-off-by: Andreas Schneider +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 434dff5..00503f1 100755 +--- a/setup.py ++++ b/setup.py +@@ -27,7 +27,8 @@ def compile_client(): + else: + from distutils.ccompiler import new_compiler + compiler = new_compiler().compiler +- subprocess.check_call(compiler + ['-O3', 'client/powerline.c', '-o', 'scripts/powerline']) ++ cflags = os.environ['CFLAGS'].get() or '-O3' ++ subprocess.check_call(compiler + [cflags, 'client/powerline.c', '-o', 'scripts/powerline']) + + try: + compile_client() +-- +2.2.0 + diff --git a/powerline.spec b/powerline.spec index 05ab074..bd255c7 100644 --- a/powerline.spec +++ b/powerline.spec @@ -1,6 +1,6 @@ Name: powerline -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: The ultimate status-line/prompt utility License: MIT @@ -19,7 +19,7 @@ Requires: fontconfig Source0: https://github.com/Lokaltog/powerline/archive/%{version}.tar.gz -Patch0: 0001-lib-Remove-wrong-shebang-from-debug.py.patch +Patch0: 0001-setup-Honor-CFLAGS-set-as-environment-variable.patch Patch1: powerline-1.3_fix_old_python_sphinx.patch %description @@ -70,7 +70,7 @@ to your ~/.tmux.conf file. # nothing to build %install -sed -i -e "/DEFAULT_SYSTEM_CONFIG_DIR/ s@None@'%{_sysconfdir}/xdg'@" powerline/__init__.py +sed -i -e "/DEFAULT_SYSTEM_CONFIG_DIR/ s@None@'%{_sysconfdir}/xdg'@" powerline/config.py sed -i -e "/TMUX_CONFIG_DIRECTORY/ s@BINDINGS_DIRECTORY@'/usr/share'@" powerline/config.py CFLAGS="%{optflags}" \ python setup.py install --prefix=%{_prefix} --root=%{buildroot} --optimize=1 @@ -81,7 +81,7 @@ pushd docs %__rm _build/html/.buildinfo # A structure gets initialized while building the docs with os.environ. # This works around an rpmlint error with the build dir being in a file. -sed -e 's/abuild/user/g' _build/html/develop/extensions.html > _build/html/develop/extensions.html +sed -i -e 's/abuild/user/g' _build/html/develop/extensions.html %__make man SPHINXBUILD=/usr/bin/sphinx-build popd @@ -155,6 +155,9 @@ install -d -m0755 %{buildroot}%{_datadir}/%{name}/zsh mv %{buildroot}%{python_sitelib}/powerline/bindings/zsh/__init__.py %{buildroot}%{_datadir}/%{name}/zsh mv %{buildroot}%{python_sitelib}/powerline/bindings/zsh/powerline.zsh %{buildroot}%{_datadir}/%{name}/zsh +# cleanup +%__rm -rf %{buildroot}%{python_sitelib}/%{name}/config_files + %if 0%{?fedora} %fdupes %{buildroot}%{python_sitelib} %endif @@ -217,6 +220,10 @@ mv %{buildroot}%{python_sitelib}/powerline/bindings/zsh/powerline.zsh %{buildroo %{_datadir}/tmux/powerline*.conf %changelog +* Tue Dec 09 2014 - Andreas Schneider - 1.3.1-1 +- Update to version 1.3.1. +- resolves: #1171420 - Fix passing optflags to the C compiler. + * Thu Dec 04 2014 - Andreas Schneider - 1.3-2 - Fix powerline-config. diff --git a/sources b/sources index 701b94b..66f9423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37d4e54bfdaf81b49fcb5e48e24a1695 1.3.tar.gz +76cc8410adc8c7644ad41d83d5705530 1.3.1.tar.gz