ncurses 6.2 - patch 20200822

[ncurses.git] / package / ncurses.spec

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 281618d5ed08fd1f30264744f7e9f6eec1c90e2b..b15fc84b33b7b6e1b6420741e0e9dfbe048d217c 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Summary: shared libraries for terminal handling
 Name: ncurses6

-Version: 6.1
-Release: 20200111
+Version: 6.2
+Release: 20200822

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz


@@ -27,7 +27,10 @@ This package is used for testing ABI %{MY_ABI}.
 %prep
 
 %global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0)
 %prep
 
 %global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0)

+%global is_fedora   %(test -f /usr/bin/dnf && echo 1 || echo 0)
+%global is_centos   %(test -f /etc/centos-release && echo 1 || echo 0)

 %global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)
 %global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)

+%global is_scilinux %(test -f /etc/sl-release && echo 1 || echo 0)

 %global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
 
 %if %{is_redhat}
 %global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
 
 %if %{is_redhat}


@@ -44,7 +47,7 @@ This package is used for testing ABI %{MY_ABI}.
 %define _disable_ld_build_id 1
 %endif
 
 %define _disable_ld_build_id 1
 %endif
 

-%if %{is_redhat}
+%if %{is_fedora} || %{is_scilinux} || %{is_centos}

 # workaround for toolset breakage in Fedora 28
 %define _test_relink --enable-relink
 %else
 # workaround for toolset breakage in Fedora 28
 %define _test_relink --enable-relink
 %else


@@ -111,10 +114,14 @@ make install.libs install.progs
 rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 
 rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 

-%if %{is_redhat}
+%if %{is_mandriva}
+# check this first because Mageia has the /etc/redhat-release file...
+%else
+%if %{is_fedora}

 %ldconfig_scriptlets libs
 %ldconfig_scriptlets c++-libs
 %endif
 %ldconfig_scriptlets libs
 %ldconfig_scriptlets c++-libs
 %endif

+%endif

 
 %clean
 if rm -rf $RPM_BUILD_ROOT; then
 
 %clean
 if rm -rf $RPM_BUILD_ROOT; then