Accepting request 706218 from home:jubalh:branches:X11:windowmanagers

- Update to 0.7.2:
  * When herbstluftwm is not running and herbstclient is called,
    the absent herbstluftwm is detected instead of hanging forever.
  * Close window on _NET_CLOSE_WINDOW. This makes closing windows
    via ewmh panels work.
  * Fix return code of remove_attr
  * Fix error when unmanaging clients
  * Some typo fixes in the documentation
- Remove and replace with sed:
  * herbstluftwm-shebangs.patch
  * herbstluftwm-shebangs-2.patch
  * herbstluftwm-shebangs-3.patch

OBS-URL: https://build.opensuse.org/request/show/706218
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/herbstluftwm?expand=0&rev=13

herbstluftwm-0.7.1.tar.gz

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

herbstluftwm-0.7.2.tar.gz

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

herbstluftwm-shebangs-2.patch

@@ -1,43 +0,0 @@
-From edc8c1656ec67b73f92f25d9cf322cea0df5d0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <edu@thorsten-wissmann.de>
-Date: Mon, 12 Oct 2015 14:27:56 +0200
-Subject: [PATCH] Unhardcode /bin/bash
-
----
- scripts/maximize.sh       | 3 ++-
- scripts/toggledualhead.sh | 2 +-
- scripts/windowmenu.sh     | 3 ++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/maximize.sh b/scripts/maximize.sh
-index 24c146c..02be5af 100755
---- a/scripts/maximize.sh
-+++ b/scripts/maximize.sh
-@@ -1,4 +1,5 @@
--#!/bin/bash -e
-+#!/usr/bin/env bash
-+set -e
- # A simple script for window maximization and window switching.
- # Running this the first time script will:
- #
-diff --git a/scripts/toggledualhead.sh b/scripts/toggledualhead.sh
-index 55ea29c..fddb82d 100755
---- a/scripts/toggledualhead.sh
-+++ b/scripts/toggledualhead.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # Splits the currently focused monitor into two monitors displayed side by side
- # Running this on a splitted monitor joins the two monitor halfs again.
-diff --git a/scripts/windowmenu.sh b/scripts/windowmenu.sh
-index 26808b8..f22c72e 100755
---- a/scripts/windowmenu.sh
-+++ b/scripts/windowmenu.sh
-@@ -1,4 +1,5 @@
--#!/bin/bash -e
-+#!/usr/bin/env bash
-+set -e
- #
- # dependencies:
- #

herbstluftwm-shebangs-3.patch

@@ -1,9 +0,0 @@
-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 ' "$@")"

herbstluftwm-shebangs.patch

@@ -1,234 +0,0 @@
-From b1fe1380419e1bc11ee017b59a9d58c238c66f91 Mon Sep 17 00:00:00 2001
-From: Brian Callahan <bcallah@openbsd.org>
-Date: Tue, 12 Aug 2014 07:42:54 -0400
-Subject: [PATCH] Unhardcode /bin/bash
-
-Eases packaging for systems that do not put bash in /bin, such as the BSDs
-(who put bash in /usr/local/bin).
----
- release.sh                 | 2 +-
- scripts/dmenu.sh           | 2 +-
- scripts/dumpbeautify.sh    | 2 +-
- scripts/exec_on_tag.sh     | 2 +-
- scripts/execwith.sh        | 2 +-
- scripts/floatmon.sh        | 2 +-
- scripts/herbstcommander.sh | 2 +-
- scripts/keychain.sh        | 2 +-
- scripts/lasttag.sh         | 2 +-
- scripts/layout.sh          | 2 +-
- scripts/loadstate.sh       | 2 +-
- scripts/q3terminal.sh      | 2 +-
- scripts/savestate.sh       | 2 +-
- scripts/scratchpad.sh      | 2 +-
- scripts/wselect.sh         | 2 +-
- share/autostart            | 2 +-
- share/dmenu_run_hlwm       | 2 +-
- share/panel.sh             | 2 +-
- share/restartpanels.sh     | 2 +-
- www/faq.txt                | 2 +-
- www/gentoc.sh              | 2 +-
- 21 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/release.sh b/release.sh
-index 6108bb1..6af1c65 100755
---- a/release.sh
-+++ b/release.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- version="$1"
- 
-diff --git a/scripts/dmenu.sh b/scripts/dmenu.sh
-index 053b45d..b3b4ebf 100755
---- a/scripts/dmenu.sh
-+++ b/scripts/dmenu.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- dm() { "${dmenu_command[@]:-dmenu}" "$@" ;}
- hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
-diff --git a/scripts/dumpbeautify.sh b/scripts/dumpbeautify.sh
-index 423d167..0a1a790 100755
---- a/scripts/dumpbeautify.sh
-+++ b/scripts/dumpbeautify.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # aligns the output of dump command as a nice tree
- # usage:
-diff --git a/scripts/exec_on_tag.sh b/scripts/exec_on_tag.sh
-index f2758ed..f2f64d9 100755
---- a/scripts/exec_on_tag.sh
-+++ b/scripts/exec_on_tag.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
- 
-diff --git a/scripts/execwith.sh b/scripts/execwith.sh
-index 775197d..34f188d 100755
---- a/scripts/execwith.sh
-+++ b/scripts/execwith.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # exec a script $2... with settings from rc-file $1
- # useful for various dmenu scripts, e.g.:
-diff --git a/scripts/floatmon.sh b/scripts/floatmon.sh
-index 48cad41..0d93be3 100755
---- a/scripts/floatmon.sh
-+++ b/scripts/floatmon.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- monitor=floatmon
- tag=fl
-diff --git a/scripts/herbstcommander.sh b/scripts/herbstcommander.sh
-index 4698bb2..efe5f20 100755
---- a/scripts/herbstcommander.sh
-+++ b/scripts/herbstcommander.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # herbstcommander.sh - launch herbstluftwm-commands via dmenu
- # Written by Florian Bruhin <me@the-compiler.org>
-diff --git a/scripts/keychain.sh b/scripts/keychain.sh
-index 1ac1c0f..764cdb4 100755
---- a/scripts/keychain.sh
-+++ b/scripts/keychain.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # Execute this (e.g. from your autostart) to obtain basic key chaining like it
- # is known from other applications like screen.
-diff --git a/scripts/lasttag.sh b/scripts/lasttag.sh
-index a6f951d..dd89314 100755
---- a/scripts/lasttag.sh
-+++ b/scripts/lasttag.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # usage: start this script in anywhere your autostart (but *after* the
- # emit_hook reload line)
-diff --git a/scripts/layout.sh b/scripts/layout.sh
-index fbac24f..5253c26 100755
---- a/scripts/layout.sh
-+++ b/scripts/layout.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # print layout of all tags, and colorizes all window ids
- # it's useful to get a overview over the list of all windows
-diff --git a/scripts/loadstate.sh b/scripts/loadstate.sh
-index 5a781f8..5954276 100755
---- a/scripts/loadstate.sh
-+++ b/scripts/loadstate.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
- 
-diff --git a/scripts/q3terminal.sh b/scripts/q3terminal.sh
-index bae9e89..2ca9fd3 100755
---- a/scripts/q3terminal.sh
-+++ b/scripts/q3terminal.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # a q3-like (or yakuake-like) terminal for arbitrary applications.
- #
-diff --git a/scripts/savestate.sh b/scripts/savestate.sh
-index 74e597b..00e102d 100755
---- a/scripts/savestate.sh
-+++ b/scripts/savestate.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
- 
-diff --git a/scripts/scratchpad.sh b/scripts/scratchpad.sh
-index 06ba00a..b3a9177 100755
---- a/scripts/scratchpad.sh
-+++ b/scripts/scratchpad.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # a i3-like scratchpad for arbitrary applications.
- #
-diff --git a/scripts/wselect.sh b/scripts/wselect.sh
-index de45d4c..c967e05 100755
---- a/scripts/wselect.sh
-+++ b/scripts/wselect.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # a window selection utility
- # dependencies: wmctrl, awk,
-diff --git a/share/autostart b/share/autostart
-index 252db1d..1808205 100755
---- a/share/autostart
-+++ b/share/autostart
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # this is a simple config for herbstluftwm
- 
-diff --git a/share/dmenu_run_hlwm b/share/dmenu_run_hlwm
-index ec20972..d8cb36c 100755
---- a/share/dmenu_run_hlwm
-+++ b/share/dmenu_run_hlwm
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- if ! command -v dmenu > /dev/null 2>/dev/null ; then
- 	echo "Error: Requirement dmenu not found in your PATH." >&2
-diff --git a/share/restartpanels.sh b/share/restartpanels.sh
-index 9d9110c..774208d 100755
---- a/share/restartpanels.sh
-+++ b/share/restartpanels.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- installdir=/
- 
-diff --git a/www/faq.txt b/www/faq.txt
-index f8ca223..131b4be 100644
---- a/www/faq.txt
-+++ b/www/faq.txt
-@@ -154,7 +154,7 @@ Add a rule for the clients pid, before the client appears. This script
- creates two xterms with different behaviours:
- 
- ----
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # Requirement: bash >= 4.0 (because of the usage of $BASHPID)
- 
-diff --git a/www/gentoc.sh b/www/gentoc.sh
-index 3f8bfe7..dc44e67 100755
---- a/www/gentoc.sh
-+++ b/www/gentoc.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # if you know a cleaner version then grepping everything out of html
- # then you are very welcome to improve this script!

herbstluftwm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed May 29 07:19:37 UTC 2019 - mvetter@suse.com
+
+- Update to 0.7.2:
+  * When herbstluftwm is not running and herbstclient is called,
+    the absent herbstluftwm is detected instead of hanging forever.
+  * Close window on _NET_CLOSE_WINDOW. This makes closing windows
+    via ewmh panels work.
+  * Fix return code of remove_attr
+  * Fix error when unmanaging clients
+  * Some typo fixes in the documentation
+- Remove and replace with sed:
+  * herbstluftwm-shebangs.patch
+  * herbstluftwm-shebangs-2.patch
+  * herbstluftwm-shebangs-3.patch
+
 -------------------------------------------------------------------
 Fri Mar 22 01:23:44 UTC 2019 - xaver@hellauer.bayern
 

herbstluftwm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package herbstluftwm
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,7 +17,7 @@
 
 
 Name:           herbstluftwm
-Version:        0.7.1
+Version:        0.7.2
 Release:        0
 Summary:        A manual tiling window manager
 License:        BSD-2-Clause
@@ -26,14 +26,8 @@ Url:            https://herbstluftwm.org
 Source0:        https://herbstluftwm.org/tarballs/%{name}-%{version}.tar.gz
 Source1:        https://herbstluftwm.org/tarballs/%{name}-%{version}.tar.gz.sig
 Source2:        %{name}.desktop
-# PATCH-FIX-SUSE Applied in reverse to replace "env" in shebangs with /bin/bash
-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
-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
-Patch3:         examples-remove-executable-bits.patch
+Patch0:         examples-remove-executable-bits.patch
 BuildRequires:  asciidoc
 BuildRequires:  gcc-c++ >= 4.9
 BuildRequires:  glib2-devel
@@ -91,11 +85,9 @@ an idea of what is possible.
 
 %prep
 %setup -q
+%patch0 -p1
 # fix errors about improper shebangs due to /usr/bin/env
-%patch0 -R -p1
-%patch1 -R -p1
-%patch2 -p1
-%patch3 -p1
+find . -type f -exec sed -i "s/#!\/usr\/bin\/env bash/#!\/usr\/bin\/bash/" {} +
 
 %build
 export CPPFLAGS="%{optflags}"