up to 3.6

diff --git a/nnn-flags.patch b/nnn-flags.patch
index 2305f2b6fe43d254e50e576fc00eccd62e9b5032..1d75cc307c646d0dcc171bc0ebb902bdc08dd036 100644 (file)
--- 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 33589bb5659066601a7756835a9cb83771d6b033..eb0f32841511506db36389af6d954a6dff2620a8 100644 (file)
--- 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 5f0e78ee807b38cc1e362255d14ca40bdeb16e77..32ca609da788e08b447c748902a1b667e4440ab5 100644 (file)
--- 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