From c90dd4f7d57c19a0191c1030d2d8bcd5ac022e84 Mon Sep 17 00:00:00 2001
From: Jani Juhani Sinervo <jani@sinervo.fi>
Date: Jun 22 2019 10:25:55 +0000
Subject: Update to 0.7.2


Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index ac37978..5dd64f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /herbstluftwm-0.6.0.tar.gz
 /herbstluftwm-0.6.1.tar.gz
 /herbstluftwm-0.6.2.tar.gz
+/herbstluftwm-0.7.2.tar.gz
diff --git a/herbstluftwm.spec b/herbstluftwm.spec
index 54dab25..f1786db 100644
--- a/herbstluftwm.spec
+++ b/herbstluftwm.spec
@@ -1,29 +1,31 @@
 Name:           herbstluftwm
-Version:        0.6.2
-Release:        10%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A manual tiling window manager
 License:        BSD
 URL:            http://herbstluftwm.org
 Source0:        http://herbstluftwm.org/tarballs/%{name}-%{version}.tar.gz
+
 BuildRequires:  gcc
-BuildRequires:  glib2-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xinerama)
 
 %description
-herbstluftwm is a manual tiling window manager for X11 using Xlib and Glib. 
+herbstluftwm is a manual tiling window manager for X11 using Xlib and Glib.
 Its main features can be described with:
 
-- The layout is based on splitting frames into subframes which can be split 
+- The layout is based on splitting frames into subframes which can be split
 again or can be filled with windows;
-- Tags (or workspaces or virtual desktops or …) can be added/removed at 
-runtime. Each tag contains an own layout exactly one tag is viewed on each 
+- Tags (or workspaces or virtual desktops or …) can be added/removed at
+runtime. Each tag contains an own layout exactly one tag is viewed on each
 monitor. The tags are monitor independent;
-- It is configured at runtime via ipc calls from herbstclient. So the 
+- It is configured at runtime via ipc calls from herbstclient. So the
 configuration file is just a script which is run on startup.
 
 %package        zsh
-Summary:        %{name} zsh completion support
+Summary:        Herbstluftwm zsh completion support
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       zsh
@@ -31,36 +33,71 @@ Requires:       zsh
 %description    zsh
 This package provides zsh completion script of %{name}.
 
+%package        fish
+Summary:        Herbstluftwm fish completion support
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Requires:       fish
+
+%description    fish
+This package provides fish completion script of %{name}.
+
 %prep
-%setup -q
+%autosetup
 
 %build
-export CFLAGS+="%{optflags}" CPPFLAGS+="%{optflags}" LDFLAGS="%{__global_ldflags}"
-make info
-make VERBOSE= %{?_smp_mflags}
+# Set the proper build flags
+%set_build_flags
+%make_build VERBOSE=""
 
 %install
-make install INSTALL="install -p" PREFIX="%{_prefix}" DESTDIR=%{buildroot} ZSHCOMPLETIONDIR='$(DATADIR)/zsh/site-functions'
-# Use %%doc macto to handle docs.
-rm -rf %{buildroot}%{_pkgdocdir}
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-mv %{buildroot}%{_sysconfdir}/bash_completion.d/herbstclient-completion \
+%make_install ZSHCOMPLETIONDIR='%{_datadir}/zsh/site-functions' \
+              FISHCOMPLETIONDIR='%{_datadir}/fish/vendor_completions.d' \
+              BASHCOMPLETIONDIR='%{_datadir}/bash-completion/completions' \
+              PREFIX='%{_prefix}'
+
+# Change the shebangs of the upstream files to be proper
+for f in "%{buildroot}%{_pkgdocdir}/examples/*.sh"
+do
+    sed -i -e "s|#!/usr/bin/env bash|#!/usr/bin/bash|" $f
+done
+
+for f in "%{buildroot}%{_sysconfdir}/xdg/%{name}/*"
+do
+    sed -i -e "s|#!/usr/bin/env bash|#!/usr/bin/bash|" $f
+done
+
+sed -i -e "s|#!/usr/bin/env bash|#!/usr/bin/bash|" "%{buildroot}%{_bindir}/dmenu_run_hlwm"
+
+# Remove unnecessary and/or redundant files
+rm %{buildroot}%{_pkgdocdir}/INSTALL
+rm %{buildroot}%{_pkgdocdir}/LICENSE
+
+mv %{buildroot}%{_datadir}/bash-completion/completions/herbstclient-completion \
    %{buildroot}%{_datadir}/bash-completion/completions/herbstclient
 
 %files
-%doc AUTHORS BUGS LICENSE MIGRATION NEWS
-%doc scripts/ doc/*.{html,txt}
+%license LICENSE
+%doc AUTHORS BUGS MIGRATION NEWS
+%doc doc/*.{html,txt}
 %{_sysconfdir}/xdg/%{name}
 %{_bindir}/*
 %{_datadir}/bash-completion/completions/herbstclient
 %{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/*.1*
-%{_mandir}/man7/*.7* 
+%{_mandir}/man1/*
+%{_mandir}/man7/*
+%{_pkgdocdir}/examples/
 
 %files zsh
 %{_datadir}/zsh/site-functions/_herbstclient
 
+%files fish
+%{_datadir}/fish/vendor_completions.d/herbstclient.fish
+
 %changelog
+* Fri Jun 21 2019 Jani Juhani Sinervo <jani@sinervo.fi> - 0.7.2-1
+- Revive under new maintainer
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index db73648..ae23fbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bfbbdb16cf88821c8dacd5165590fd2  herbstluftwm-0.6.2.tar.gz
+SHA512 (herbstluftwm-0.7.2.tar.gz) = abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c