From 10ac92a6455a6334b3ad45e1e1d8121302b5bf81 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:33:58 +0100 Subject: [PATCH] don't obsolete libguile20 [release 2.2.7-3mamba;Thu Aug 17 2023] --- libguile22.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/libguile22.spec b/libguile22.spec index ccb5fd4..d7a2d6b 100644 --- a/libguile22.spec +++ b/libguile22.spec @@ -1,7 +1,7 @@ %define majversion %(echo %version | cut -d. -f 1-2) Name: libguile22 Version: 2.2.7 -Release: 1mamba +Release: 3mamba Summary: A GNU implementation of Scheme for application extensibility Group: Development/Applications Vendor: openmamba @@ -13,7 +13,6 @@ Patch0: libguile-2.0.11-arm-asm.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libffi-devel BuildRequires: libgc-devel BuildRequires: libgmp-devel @@ -21,13 +20,13 @@ BuildRequires: libltdl-devel BuildRequires: libncurses-devel BuildRequires: libreadline-devel BuildRequires: libunistring-devel +BuildRequires: libxcrypt-devel ## AUTOBUILDREQ-END BuildRequires: libunistring-devel >= 0.9.6-1mamba BuildRequires: pkg-config BuildRequires: slib >= 3b3 Requires(post):%{__install_info} Requires(post):slib >= 3b3 -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library implementation of the Scheme programming language, written in C. @@ -59,6 +58,8 @@ You'll also need to install the guile package. %prep %setup -q -n guile-%{version} +#-D -T +#:<< _EOF %define _use_internal_dependency_generator 0 @@ -79,6 +80,7 @@ _EOF chmod +x %{_builddir}/guile-%{version}/find_requires.sh %build +#:<< _EOF %configure \ --program-suffix=22 \ --with-threads \ @@ -130,6 +132,10 @@ mv %{buildroot}%{_libdir}/*.scm %{buildroot}%{_datadir}/gdb/auto-load/%{_libdir} #rm -rf %{buildroot}/usr/include/guile-readline #rm -rf %{buildroot}%{_datadir}/info/dir +# Conflicting files +rm -rf %{buildroot}%{_datadir}/aclocal/* +rm -rf %{buildroot}%{_infodir}/* + ## Compress large documentation #bzip2 NEWS @@ -165,7 +171,6 @@ fi %dir %{_libdir}/guile/%{majversion}/ccache %{_libdir}/guile/%{majversion}/ccache/* %dir %{_libdir}/guile/%{majversion}/extensions -%{_libdir}/guile/%{majversion}/extensions/guile-readline.la %{_libdir}/guile/%{majversion}/extensions/guile-readline.so %{_libdir}/guile/%{majversion}/extensions/guile-readline.so.* %doc AUTHORS THANKS @@ -179,11 +184,10 @@ fi %{_includedir}/guile/%{majversion}/*.h %dir %{_includedir}/guile/%{majversion}/libguile %{_includedir}/guile/%{majversion}/libguile/*.h -%{_libdir}/libguile-%{majversion}.la %{_libdir}/libguile-%{majversion}.so %{_libdir}/pkgconfig/guile-%{majversion}.pc -%{_datadir}/aclocal/* -%{_infodir}/* +#%{_datadir}/aclocal/* +#%{_infodir}/* #%doc ChangeLog GUILE-VERSION HACKING NEWS.bz2 README %files tools @@ -201,6 +205,12 @@ fi %changelog +* Thu Aug 17 2023 Silvan Calarco 2.2.7-3mamba +- don't obsolete libguile20 + +* Sat Aug 05 2023 Silvan Calarco 2.2.7-2mamba +- restore for lilypond and obsolete libguile20 + * Thu May 21 2020 Silvan Calarco 2.2.7-1mamba - update to 2.2.7 - legacy package