From 650858e4171a9daf5225562488742c0abf1e36f5 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Feb 06 2019 21:26:38 +0000
Subject: 4.9 bump


Upstream updated their Makefile and config.mk so that we don't need some
of the substitutions anymore.

Signed-off-by: Petr Šabata <contyk@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index d9e093a..c268163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ dmenu-4.1.1.tar.gz
 /dmenu-4.6.tar.gz
 /dmenu-4.7.tar.gz
 /dmenu-4.8.tar.gz
+/dmenu-4.9.tar.gz
diff --git a/dmenu.spec b/dmenu.spec
index 9ea1c87..43b37a6 100644
--- a/dmenu.spec
+++ b/dmenu.spec
@@ -1,6 +1,6 @@
 Name:           dmenu
-Version:        4.8
-Release:        3%{?dist}
+Version:        4.9
+Release:        1%{?dist}
 Summary:        Generic menu for X
 License:        MIT
 URL:            http://tools.suckless.org/%{name}
@@ -21,12 +21,9 @@ huge amounts (up to 10.000 and more) of user defined menu items efficiently.
 
 %prep
 %autosetup
-# Nuke the silent build.
-sed -i -e 's|\t@|\t|' Makefile
-# Insert optflags.
+# Insert optflags + ldflags
 sed -i -e 's|-Os|%{optflags}|' config.mk
-# No strip for debuginfo, and insert ldflags to enhance the security.
-sed -i -e 's|-s ${LIBS}|%{?__global_ldflags} ${LIBS}|' config.mk
+sed -i -e 's|$(LIBS)|%{?__global_ldflags} $(LIBS)|' config.mk
 # X includedir path fix
 sed -i -e 's|X11INC = .*|X11INC = %{_includedir}|' config.mk
 # libdir path fix
@@ -46,6 +43,9 @@ make %{?_smp_mflags}
 %{_mandir}/man*/stest.*
 
 %changelog
+* Wed Feb 06 2019 Petr Šabata <contyk@redhat.com> - 4.9-1
+- 4.9 bump
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 1f36471..0e1d34e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dmenu-4.8.tar.gz) = fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
+SHA512 (dmenu-4.9.tar.gz) = c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65