up to 4.5

[packages/nnn.git] / nnn.spec

diff --git a/nnn.spec b/nnn.spec
index 1ef9c446e3b1fd5ba43b2d641a917236b10f6340..e6cced35f35cb9f3b3dac216e46275ffec752018 100644 (file)
--- a/nnn.spec
+++ b/nnn.spec
@@ -3,14 +3,13 @@
 #
 Summary:       The missing terminal file browser for X
 Name:          nnn
-Version:       3.3
-Release:       2
+Version:       4.5
+Release:       1
 License:       BSD
 Group:         Applications/Console
 Source0:       https://github.com/jarun/nnn/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 08c00d529ab824329b1f30968c3037b0
+# Source0-md5: 7358f4ca32c04e1a1bef7633ab10aff6
 Patch0:                %{name}-no-rebuild-on-install.patch
-Patch1:                %{name}-flags.patch
 URL:           https://github.com/jarun/nnn
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
@@ -51,9 +50,7 @@ Summary(pl.UTF-8):    bashowe uzupełnianie nazw dla nnn
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      bash-completion >= 2.0
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-nnn
 This package provides bash-completion for nnn.
@@ -67,6 +64,7 @@ Summary(pl.UTF-8):    Dopełnianie parametrów w fish dla polecenia nnn
 Group:         Applications/Shells
 Requires:      fish
 Requires:      nnn = %{version}-%{release}
+BuildArch:     noarch
 
 %description -n fish-completion-nnn
 Fish completion for nnn command.
@@ -80,6 +78,7 @@ Summary(pl.UTF-8):    Dopełnianie parametrów w zsh dla polecenia nnn
 Group:         Applications/Shells
 Requires:      nnn = %{version}-%{release}
 Requires:      zsh
+BuildArch:     noarch
 
 %description -n zsh-completion-nnn
 Zsh completion for nnn command.
@@ -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