commit ae9d9c43ca902af6bbcc6f6a5724cdd432f1a3bf
Author: Jan Palus <[email protected]>
Date: Thu Jun 3 22:04:09 2021 +0000
up to 4.1.1
- dropped redudant flags patch
nnn-flags.patch | 33 ---------------------------------
nnn.spec | 12 +++++-------
2 files changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/nnn.spec b/nnn.spec
index 73b120a..b20881d 100644
--- a/nnn.spec
+++ b/nnn.spec
@@ -3,14 +3,13 @@
#
Summary: The missing terminal file browser for X
Name: nnn
-Version: 4.0
+Version: 4.1.1
Release: 1
License: BSD
Group: Applications/Console
Source0:
https://github.com/jarun/nnn/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: c21421963ab6b6255a560e2a2c410468
+# Source0-md5: 260da5978d485c54c96ab8d73d7ad353
Patch0: %{name}-no-rebuild-on-install.patch
-Patch1: %{name}-flags.patch
URL: https://github.com/jarun/nnn
BuildRequires: ncurses-devel
BuildRequires: pcre-devel
@@ -90,15 +89,14 @@ Dopełnianie parametrów w zsh dla polecenia nnn.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
+export CFLAGS="%{rpmcflags}"
+export CPPFLAGS="%{rpmcppflags}"
+export LDFLAGS="%{rpmldflags}"
%{__make} \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags}" \
CFLAGS_OPTIMIZATION= \
- CPPFLAGS="%{rpmcppflags}" \
- LDFLAGS="%{rpmldflags}" \
O_CTX8=1 \
O_PCRE=1
diff --git a/nnn-flags.patch b/nnn-flags.patch
deleted file mode 100644
index 1d75cc3..0000000
--- a/nnn-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- nnn-3.3/Makefile.orig 2020-08-06 12:43:07.917453708 +0200
-+++ nnn-3.3/Makefile 2020-08-06 12:46:43.682792814 +0200
-@@ -41,7 +41,7 @@
- endif
-
- ifeq ($(strip $(O_PCRE)),1)
-- CPPFLAGS += -DPCRE
-+ override CPPFLAGS += -DPCRE
- LDLIBS += -lpcre
- endif
-
-@@ -62,7 +62,7 @@
- endif
-
- ifeq ($(strip $(O_CTX8)),1)
-- CPPFLAGS += -DCTX8
-+ override CPPFLAGS += -DCTX8
- endif
-
- ifeq ($(strip $(O_ICONS)),1)
-@@ -75,9 +75,9 @@
- LDLIBS_CURSES ?= -lncurses
- endif
-
--CFLAGS += -std=c11 -Wall -Wextra -Wshadow
--CFLAGS += $(CFLAGS_OPTIMIZATION)
--CFLAGS += $(CFLAGS_CURSES)
-+override CFLAGS += -std=c11 -Wall -Wextra -Wshadow
-+override CFLAGS += $(CFLAGS_OPTIMIZATION)
-+override CFLAGS += $(CFLAGS_CURSES)
-
- LDLIBS += $(LDLIBS_CURSES)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nnn.git/commitdiff/ae9d9c43ca902af6bbcc6f6a5724cdd432f1a3bf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
