From e9317e9d5d60bbafccec65f4181e05425db1a13b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 19 Apr 2022 16:45:32 +0200 Subject: [PATCH] drop compat-libs (ABI 5) subpackage --- ncurses.spec | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/ncurses.spec b/ncurses.spec index 405dfd8..3fe93ab 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -30,6 +30,7 @@ tool captoinfo. %package libs Summary: Ncurses libraries Requires: %{name}-base = %{version}-%{release} +Obsoletes: %{name}-compat-libs < 6.3-1 %description libs The curses library routines are a terminal-independent method of @@ -39,19 +40,6 @@ discontinued 4.4 BSD classic curses library. This package contains the ncurses libraries. -%package compat-libs -Summary: Ncurses compatibility libraries -Requires: %{name}-base = %{version}-%{release} - -%description compat-libs -The curses library routines are a terminal-independent method of -updating character screens with reasonable optimization. The ncurses -(new curses) library is a freely distributable replacement for the -discontinued 4.4 BSD classic curses library. - -This package contains the ABI version 5 of the ncurses libraries for -compatibility. - %package c++-libs Summary: Ncurses C++ bindings Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -140,7 +128,7 @@ common_options="\ --without-ada" abi5_options="--with-chtype=long" -for abi in 5 6; do +for abi in 6; do for char in narrowc widec; do mkdir $char$abi pushd $char$abi @@ -163,9 +151,6 @@ for abi in 5 6; do done %install -make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs -rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.5* -make -C widec5 DESTDIR=$RPM_BUILD_ROOT install.libs make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6* make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man} @@ -233,8 +218,6 @@ xz NEWS %ldconfig_scriptlets c++-libs -%ldconfig_scriptlets compat-libs - %files %doc ANNOUNCE AUTHORS NEWS.xz README TO-DO %{_bindir}/[cirt]* @@ -246,9 +229,6 @@ xz NEWS %exclude %{_libdir}/libncurses++*.so.6* %{_libdir}/lib*.so.6* -%files compat-libs -%{_libdir}/lib*.so.5* - %files c++-libs %{_libdir}/libncurses++*.so.6*