From: Jan Palus <atler@pld-linux.org>
Date: Mon, 15 Mar 2021 20:59:30 +0000 (+0100)
Subject: up to 3.6
X-Git-Tag: auto/th/nnn-3.6-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnnn.git;a=commitdiff_plain;h=5b10cffe41421a257aa80cb7ec36de7dec187bf4;hp=321fea6778eb6cef9d8259f6c4e9870b3234f5a4

up to 3.6
---

diff --git a/nnn-flags.patch b/nnn-flags.patch
index 2305f2b..1d75cc3 100644
--- a/nnn-flags.patch
+++ b/nnn-flags.patch
@@ -3,7 +3,7 @@
 @@ -41,7 +41,7 @@
  endif
  
- ifeq ($(O_PCRE),1)
+ ifeq ($(strip $(O_PCRE)),1)
 -	CPPFLAGS += -DPCRE
 +	override CPPFLAGS += -DPCRE
  	LDLIBS += -lpcre
@@ -12,12 +12,12 @@
 @@ -62,7 +62,7 @@
  endif
  
- ifeq ($(O_CTX8),1)
+ ifeq ($(strip $(O_CTX8)),1)
 -	CPPFLAGS += -DCTX8
 +	override CPPFLAGS += -DCTX8
  endif
  
- ifeq ($(shell $(PKG_CONFIG) ncursesw && echo 1),1)
+ ifeq ($(strip $(O_ICONS)),1)
 @@ -75,9 +75,9 @@
  	LDLIBS_CURSES ?= -lncurses
  endif
diff --git a/nnn-no-rebuild-on-install.patch b/nnn-no-rebuild-on-install.patch
index 33589bb..eb0f328 100644
--- a/nnn-no-rebuild-on-install.patch
+++ b/nnn-no-rebuild-on-install.patch
@@ -1,8 +1,8 @@
 --- nnn-2.1/Makefile~	2018-11-23 12:22:14.000000000 +0100
 +++ nnn-2.1/Makefile	2018-11-25 17:45:26.122311818 +0100
 @@ -30,7 +30,7 @@
- debug: $(SRC)
- 	$(CC) -DDEBUGMODE -g $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(BIN) $^ $(LDLIBS)
+ 	$(RM) $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps/nnn.svg
+ 	$(RM) $(DESTDIR)$(DESKTOPICONPREFIX)/64x64/apps/nnn.png
  
 -install: all
 +install:
diff --git a/nnn.spec b/nnn.spec
index 5f0e78e..32ca609 100644
--- a/nnn.spec
+++ b/nnn.spec
@@ -3,12 +3,12 @@
 #
 Summary:	The missing terminal file browser for X
 Name:		nnn
-Version:	3.5
+Version:	3.6
 Release:	1
 License:	BSD
 Group:		Applications/Console
 Source0:	https://github.com/jarun/nnn/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f5bb1d9e6626363f90330fca1a995cad
+# Source0-md5:	bf4e723f4d60b24f97c9a0c98602d8de
 Patch0:		%{name}-no-rebuild-on-install.patch
 Patch1:		%{name}-flags.patch
 URL:		https://github.com/jarun/nnn