diff --git a/readline-8.0-shlib.patch b/readline-8.2-shlib.patch similarity index 74% rename from readline-8.0-shlib.patch rename to readline-8.2-shlib.patch index 2a888f1995b57d34a03a23fc23d96736d7b42eb1..15ca98c16188951a34bab0c943199ebd62ab8406 100644 --- a/readline-8.0-shlib.patch +++ b/readline-8.2-shlib.patch @@ -1,5 +1,3 @@ -diff --git a/shlib/Makefile.in b/shlib/Makefile.in -index d138524..b68b0cc 100644 --- a/shlib/Makefile.in +++ b/shlib/Makefile.in @@ -178,7 +178,7 @@ $(SHARED_READLINE): $(SHARED_OBJ) @@ -11,12 +9,10 @@ index d138524..b68b0cc 100644 # Since tilde.c is shared between readline and bash, make sure we compile # it with the right flags when it's built as part of readline -diff --git a/support/shobj-conf b/support/shobj-conf -index 5a3f977..0668a33 100644 ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -126,10 +126,11 @@ sunos5*|solaris2*) - linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*) +--- a/support/shobj-conf.orig 2021-12-03 23:54:46.000000000 +0800 ++++ b/support/shobj-conf 2022-11-22 12:00:46.395593262 +0800 +@@ -126,10 +126,11 @@ + linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/readline-8.1.tar.gz b/readline-8.2.tar.gz similarity index 31% rename from readline-8.1.tar.gz rename to readline-8.2.tar.gz index 882f57caef16b7b48d7db356959d4fe68c1165b0..ca5396a76bb691dc297f501b3ceb3324f4ad768f 100644 Binary files a/readline-8.1.tar.gz and b/readline-8.2.tar.gz differ diff --git a/readline.spec b/readline.spec index ab53eeea335bf752837e361c5b66f7f150c51420..fff0ae9144d120908602a6c3cb9beaf32eaf850b 100644 --- a/readline.spec +++ b/readline.spec @@ -1,8 +1,8 @@ -%define anolis_release 4 +%define anolis_release 1 Summary: A library for editing typed command lines Name: readline -Version: 8.1 +Version: 8.2 Release: %{anolis_release}%{?dist} License: GPLv3+ URL: https://tiswww.case.edu/php/chet/readline/rltop.html @@ -10,7 +10,8 @@ Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz # Other patches # Remove RPATH, use CFLAGS -Patch101: readline-8.0-shlib.patch +Patch101: readline-8.2-shlib.patch + BuildRequires: gcc BuildRequires: ncurses-devel @@ -60,12 +61,9 @@ library. %make_install rm -vrf %{buildroot}%{_docdir}/readline -rm -vf %{buildroot}%{_infodir}/dir* %generate_compatibility_deps -%ldconfig_scriptlets - %files %license COPYING USAGE %dir %{abidir} @@ -81,7 +79,7 @@ rm -vf %{buildroot}%{_infodir}/dir* %{_includedir}/readline/ %{_libdir}/libreadline.so %{_libdir}/libhistory.so -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/*.pc %{_mandir}/man3/readline.3* %{_mandir}/man3/history.3* %{_infodir}/readline.info* @@ -94,13 +92,16 @@ rm -vf %{buildroot}%{_infodir}/dir* %{_libdir}/libhistory.a %changelog +* Tue Nov 22 2022 Funda Wang - 8.2-1 +- New version 8.2 + * Fri Oct 14 2022 Chunmei Xu - 8.1-4 - optimise spec file * Thu Oct 13 2022 mgb01105731 - 8.1-3 - add abi -* Thu Sep 30 2022 mgb01105731 - 8.1-2 +* Fri Sep 30 2022 mgb01105731 - 8.1-2 - add doc package * Tue Mar 08 2022 Renbo - 8.1-1