From 8f0b19e1d86803b9dc6072c84d450c2b7dda659e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:21:41 +0000 Subject: [PATCH] import UBI libedit-3.1-52.20230828cvs.el10 --- .gitignore | 2 +- .libedit.metadata | 1 - SPECS/libedit.spec => libedit.spec | 169 +++++++++++++++++++++++------ sources | 1 + 4 files changed, 139 insertions(+), 34 deletions(-) delete mode 100644 .libedit.metadata rename SPECS/libedit.spec => libedit.spec (59%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 3acce01..6b62bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libedit-20170329-3.1.tar.gz +libedit-20230828-3.1.tar.gz diff --git a/.libedit.metadata b/.libedit.metadata deleted file mode 100644 index f6c74ca..0000000 --- a/.libedit.metadata +++ /dev/null @@ -1 +0,0 @@ -7b7bde97429d96a42b0a95ed3c6bec56101ec9f0 SOURCES/libedit-20170329-3.1.tar.gz diff --git a/SPECS/libedit.spec b/libedit.spec similarity index 59% rename from SPECS/libedit.spec rename to libedit.spec index 80c4334..ecfcff6 100644 --- a/SPECS/libedit.spec +++ b/libedit.spec @@ -1,15 +1,37 @@ -%global snap 20170329 -%global dir_snap 20170329 +%global snap 20230828 +%global dir_snap 20230828 Summary: The NetBSD Editline library Name: libedit Version: 3.1 -Release: 23.%{snap}cvs%{?dist} -License: BSD -Group: System Environment/Libraries -URL: http://www.thrysoee.dk/editline/ -Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz +Release: 52.%{snap}cvs%{?dist} + +# The project as a whole is BSD-3-Clause. +# These files are BSD-2-Clause: +# - doc/editline.3.roff +# - doc/editrc.5.roff +# - src/chartype.{c,h} +# - src/editline/readline.h +# - src/eln.c +# - src/filecomplete.{c,h} +# - src/getline.c [not linked into final library] +# - src/literal.{c,h} +# - src/read.h +# - src/readline.c +# - src/reallocarr.c +# This file is both BSD-3-Clause and BSD-2-Clause: +# - src/vis.c +# These files are ISC: +# - doc/editline.7.roff +# - src/strlcat.c +# - src/strlcpy.c +License: BSD-3-Clause AND BSD-2-Clause AND ISC +URL: https://www.thrysoee.dk/editline/ +Source0: https://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz + BuildRequires: gcc +BuildRequires: groff-base +BuildRequires: make BuildRequires: ncurses-devel %description @@ -19,55 +41,44 @@ to those found in GNU Readline. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ncurses-devel%{?_isa} %description devel This package contains development files for %{name}. %prep -%setup -q -n %{name}-%{dir_snap}-%{version} +%autosetup -n %{name}-%{dir_snap}-%{version} -# Suppress rpmlint error. -iconv -f ISO8859-1 -t UTF-8 -o ChangeLog.utf-8 ChangeLog -touch -r ChangeLog ChangeLog.utf-8 -mv -f ChangeLog.utf-8 ChangeLog - -# Replace an nroff macro that is not available, and not needed, on Linux -sed -i 's,\\\*\[Gt\],>,' doc/editline.3.roff +# Fix unused direct shared library dependencies. +sed -i "s/lncurses/ltinfo/" configure %build %configure --disable-static --disable-silent-rules -# Fix unused direct shared library dependencies. -sed -i "s/lncurses/ltinfo/" src/Makefile - -# Downstream projects do not need to link with ncurses, just libedit. -sed -i "s/ -lncurses//" libedit.pc - -make %{?_smp_mflags} +%make_build %install -make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +%make_install find $RPM_BUILD_ROOT -type f -name "*.la" -delete # See rhbz#1349671 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/history.3* - -%ldconfig_scriptlets +rm -f $RPM_BUILD_ROOT%{_mandir}/man3/history.3* %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc ChangeLog THANKS %{_mandir}/man5/editrc.5* -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.0 +%{_libdir}/%{name}.so.0.* %files devel %doc examples/fileman.c examples/tc1.c examples/wtc1.c -%{_mandir}/man3/* -%{_mandir}/man7/* +%{_mandir}/man3/editline.3* +%{_mandir}/man3/el_*.3* +%{_mandir}/man3/history_*.3* +%{_mandir}/man3/tok_*.3* +%{_mandir}/man7/editline.7* %{_includedir}/histedit.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc @@ -75,6 +86,100 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/history.3* %{_includedir}/editline/readline.h %changelog +* Tue Oct 29 2024 Troy Dawson - 3.1-52.20230828cvs +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 3.1-51.20230828cvs +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 3.1-50.20230828cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.1-49.20230828cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 28 2023 Jerry James - 3.1-48.20230828cvs +- New version (20230828-3.1) + +* Wed Aug 2 2023 Jerry James - 3.1-47.20221030cvs +- Drop unneeded strlcat patch + +* Thu Jul 20 2023 Fedora Release Engineering - 3.1-46.20221030cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.1-45.20221030cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Nov 26 2022 Jerry James - 3.1-44.20221030cvs +- New version (20221030-3.1) + +* Mon Oct 10 2022 Jerry James - 3.1-43.20221009cvs +- New version (20221009-3.1) +- Convert License tag to SPDX + +* Thu Jul 21 2022 Fedora Release Engineering - 3.1-42.20210910cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 3.1-41.20210910cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Sep 13 2021 Jerry James - 3.1-40.20210910cvs +- New version (20210910-3.1) + +* Thu Jul 22 2021 Fedora Release Engineering - 3.1-39.20210714cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 14 2021 Jerry James - 3.1-38.20210714cvs +- New version (20210714-3.1) + +* Sat May 22 2021 Jerry James - 3.1-37.20210522cvs +- New version (20210522-3.1) + +* Tue Apr 20 2021 Jerry James - 3.1-36.20210419cvs +- New version (20210419-3.1) +- Add -strlcat patch to avoid polluting the global namespace + +* Tue Feb 16 2021 Jerry James - 3.1-35.20210216cvs +- New version (20210216-3.1) + +* Tue Jan 26 2021 Fedora Release Engineering - 3.1-34.20191231cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.1-33.20191231cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.1-32.20191231cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 3 2020 Jerry James - 3.1-31.20191231cvs +- New version (20191231-3.1) + +* Wed Dec 11 2019 Jerry James - 3.1-30.20191211cvs +- New version (20191211-3.1) + +* Sat Oct 26 2019 Jerry James - 3.1-29.20191025cvs +- New version (20191025-3.1) + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1-28.20190324cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat May 11 2019 Jerry James - 3.1-27.20190324cvs +- New version (20190324-3.1), fixes bz 1677247 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.1-26.20181209cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Jerry James - 3.1-25.20181209cvs +- New version (20181209-3.1) +- ChangeLog is now UTF-8, so drop conversion from ISO8859-1 +- Drop man page fix, fixed upstream +- Drop pkgconfig file fix, fixed upstream +- Add groff-base BR for man page generation + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1-24.20170329cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Mar 3 2018 Jerry James - 3.1-23.20170329cvs - Add gcc BR - Build verbosely diff --git a/sources b/sources new file mode 100644 index 0000000..bd66040 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libedit-20230828-3.1.tar.gz) = c7232376ef1bc128ed79f950a5f1f207f874011218682d7e6186f76443927df5483b46c4daa8cf02e327079259aee1a56e2b791aa682491eb802d90ff8940cca