ncurses 6.2 - patch 20200831

[ncurses.git] / package / ncurses.spec

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 48b7177de40f02d16d10c48531dc65c1537ed6a0..e99aefa27887e94f28b54857779095e4ae744de1 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,15 +1,12 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Summary: shared libraries for terminal handling
 Name: ncurses6

-Version: 6.1
-Release: 20191123
+Version: 6.2
+Release: 20200831

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 # URL: https://invisible-island.net/ncurses/
 
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 # URL: https://invisible-island.net/ncurses/
 

-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-

 %global MY_ABI 6
 
 # save value before redefining
 %global MY_ABI 6
 
 # save value before redefining


@@ -30,11 +27,17 @@ 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)
 
 %global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
 

-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else

 %define debug_package %{nil}
 %define debug_package %{nil}

+%endif

 
 %if %{is_mandriva}
 %define _disable_ld_as_needed 1
 
 %if %{is_mandriva}
 %define _disable_ld_as_needed 1


@@ -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


@@ -100,8 +103,6 @@ This package is used for testing ABI %{MY_ABI}.
        --without-debug \\\
        --without-normal
 
        --without-debug \\\
        --without-normal
 

-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \

 %configure %{CFG_OPTS}
 
 make
 %configure %{CFG_OPTS}
 
 make


@@ -113,6 +114,15 @@ 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_mandriva}
+# check this first because Mageia has the /etc/redhat-release file...
+%else
+%if %{is_fedora}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+%endif
+

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


@@ -129,6 +139,11 @@ exit 0
 
 %changelog
 
 
 %changelog
 

+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+  matching Fedora's PIE/PIC configuration.  Also, generate debug/debug-source
+  packages.
+

 * Sat Nov 16 2019 Thomas Dickey
 - modify clean-rule to work around Fedora NFS bugs.
 
 * Sat Nov 16 2019 Thomas Dickey
 - modify clean-rule to work around Fedora NFS bugs.