ncurses 6.1 - patch 20191221

[ncurses.git] / package / ncurses.spec

diff --git a/package/ncurses.spec b/package/ncurses.spec
index e60ee53b4b7ce53829ca34a3f0750886e0b9dde4..2209e1df99cabf970946f3bd52ed96f2b6ebe9c1 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20180908
+Release: 20191221
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
@@ -44,10 +44,16 @@ This package is used for testing ABI %{MY_ABI}.
 %define _disable_ld_build_id 1
 %endif
 
+%if %{is_redhat}
+# workaround for toolset breakage in Fedora 28
+%define _test_relink --enable-relink
+%else
+%define _test_relink --disable-relink
+%endif
+
 %setup -q -n ncurses-%{version}-%{release}
 
 %build
-%define my_srcdir ..
 %define CFG_OPTS \\\
        --target %{_target_platform} \\\
        --prefix=%{_prefix} \\\
@@ -60,7 +66,7 @@ This package is used for testing ABI %{MY_ABI}.
        --disable-leaks \\\
        --disable-macros  \\\
        --disable-overwrite  \\\
-       --disable-relink  \\\
+       %{_test_relink}  \\\
        --disable-termcap \\\
        --enable-hard-tabs \\\
        --enable-opaque-curses \\\
@@ -97,6 +103,7 @@ This package is used for testing ABI %{MY_ABI}.
 CFLAGS="%{CC_NORMAL}" \
 RPATH_LIST=../lib:%{_libdir} \
 %configure %{CFG_OPTS}
+
 make
 
 %install
@@ -107,7 +114,12 @@ rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+if rm -rf $RPM_BUILD_ROOT; then
+  echo OK
+else
+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -117,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
 * Sat Aug 25 2018 Thomas E. Dickey
 - split spec-file into ncurses6 and ncursest6 to work around toolset breakage
   in Fedora 28