Accepting request 687686 from home:xha:branches:openSUSE:Factory

- updated to latest stable release (0.7.1)
- changes to herbstluftwm-shebangs.patch due to rejects caused by upstream changes
- add herbstluftwm-shebangs-3.patch
- fish-completion package

OBS-URL: https://build.opensuse.org/request/show/687686
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/herbstluftwm?expand=0&rev=12
This commit is contained in:
Ondřej Súkup 2019-04-30 15:21:56 +00:00 committed by Git OBS Bridge
parent 006b679c1c
commit a10737d8e0
8 changed files with 41 additions and 15 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e2ffc30b7911407230a5eeb61e044cea78557999107d372bc2dbc3d82d0ae27
size 247469

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71ec8816b520e0487f98498cb225949cc01a6e32766b3bece46439d4cb5f19f2
size 184341

Binary file not shown.

View File

@ -0,0 +1,9 @@
diff -ur a/share/panel.sh b/share/panel.sh
--- a/share/panel.sh 2018-08-09 17:29:15.000000000 +0200
+++ b/share/panel.sh 2019-03-22 13:49:05.946256024 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
quote() {
local q="$(printf '%q ' "$@")"

View File

@ -199,16 +199,6 @@ index ec20972..d8cb36c 100755
if ! command -v dmenu > /dev/null 2>/dev/null ; then if ! command -v dmenu > /dev/null 2>/dev/null ; then
echo "Error: Requirement dmenu not found in your PATH." >&2 echo "Error: Requirement dmenu not found in your PATH." >&2
diff --git a/share/panel.sh b/share/panel.sh
index 1cab57e..e40ab9d 100755
--- a/share/panel.sh
+++ b/share/panel.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
monitor=${1:-0}
diff --git a/share/restartpanels.sh b/share/restartpanels.sh diff --git a/share/restartpanels.sh b/share/restartpanels.sh
index 9d9110c..774208d 100755 index 9d9110c..774208d 100755
--- a/share/restartpanels.sh --- a/share/restartpanels.sh

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 22 01:23:44 UTC 2019 - xaver@hellauer.bayern
- updated to latest stable release (0.7.1)
- changes to herbstluftwm-shebangs.patch due to rejects caused by upstream changes
- add herbstluftwm-shebangs-3.patch
- fish-completion package
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 10 14:22:05 UTC 2018 - jengelh@inai.de Wed Jan 10 14:22:05 UTC 2018 - jengelh@inai.de

View File

@ -17,7 +17,7 @@
Name: herbstluftwm Name: herbstluftwm
Version: 0.7.0 Version: 0.7.1
Release: 0 Release: 0
Summary: A manual tiling window manager Summary: A manual tiling window manager
License: BSD-2-Clause License: BSD-2-Clause
@ -30,8 +30,10 @@ Source2: %{name}.desktop
Patch0: https://github.com/%{name}/%{name}/commit/b1fe1380419e1bc11ee017b59a9d58c238c66f91.patch#/%{name}-shebangs.patch Patch0: https://github.com/%{name}/%{name}/commit/b1fe1380419e1bc11ee017b59a9d58c238c66f91.patch#/%{name}-shebangs.patch
# PATCH-FIX-SUSE Applied in reverse to replace "env" in shebangs with /bin/bash # PATCH-FIX-SUSE Applied in reverse to replace "env" in shebangs with /bin/bash
Patch1: https://github.com/%{name}/%{name}/commit/edc8c1656ec67b73f92f25d9cf322cea0df5d0a6.patch#/%{name}-shebangs-2.patch Patch1: https://github.com/%{name}/%{name}/commit/edc8c1656ec67b73f92f25d9cf322cea0df5d0a6.patch#/%{name}-shebangs-2.patch
# PATCH-FIX-SUSE Applied in reverse to replace "env" in shebangs with /bin/bash
Patch2: %{name}-shebangs-3.patch
# PATCH-FIX-SUSE Remove executable bits from the documentation # PATCH-FIX-SUSE Remove executable bits from the documentation
Patch2: examples-remove-executable-bits.patch Patch3: examples-remove-executable-bits.patch
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: gcc-c++ >= 4.9 BuildRequires: gcc-c++ >= 4.9
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -56,6 +58,16 @@ BuildArch: noarch
%description bash-completion %description bash-completion
Bash completion for herbstclient Bash completion for herbstclient
%package fish-completion
Summary: Fish completion for %{name}
Group: System/Shells
Requires: %{name} = %{version}
Supplements: packageand(%{name}:fish)
BuildArch: noarch
%description fish-completion
Fish completion for herbstclient
%package zsh-completion %package zsh-completion
Summary: Zsh completion for %{name} Summary: Zsh completion for %{name}
Group: System/Shells Group: System/Shells
@ -83,6 +95,7 @@ an idea of what is possible.
%patch0 -R -p1 %patch0 -R -p1
%patch1 -R -p1 %patch1 -R -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
export CPPFLAGS="%{optflags}" export CPPFLAGS="%{optflags}"
@ -125,6 +138,7 @@ rm -f %{buildroot}%{_datadir}/doc/%{name}/{INSTALL,NEWS,LICENSE,BUGS}
%{_datadir}/doc/%{name}/examples/dumpbeautify.sh %{_datadir}/doc/%{name}/examples/dumpbeautify.sh
%{_datadir}/doc/%{name}/examples/exec_on_tag.sh %{_datadir}/doc/%{name}/examples/exec_on_tag.sh
%{_datadir}/doc/%{name}/examples/execwith.sh %{_datadir}/doc/%{name}/examples/execwith.sh
%{_datadir}/doc/%{name}/examples/float-maximize.sh
%{_datadir}/doc/%{name}/examples/floatmon.sh %{_datadir}/doc/%{name}/examples/floatmon.sh
%{_datadir}/doc/%{name}/examples/herbstcommander.sh %{_datadir}/doc/%{name}/examples/herbstcommander.sh
%{_datadir}/doc/%{name}/examples/keychain.sh %{_datadir}/doc/%{name}/examples/keychain.sh
@ -148,4 +162,9 @@ rm -f %{buildroot}%{_datadir}/doc/%{name}/{INSTALL,NEWS,LICENSE,BUGS}
%files bash-completion %files bash-completion
%config %{_sysconfdir}/bash_completion.d/herbstclient-completion %config %{_sysconfdir}/bash_completion.d/herbstclient-completion
%files fish-completion
%dir %{_datadir}/fish
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/herbstclient.fish
%changelog %changelog