guile-2.0.14-gc_pkgconfig_private.patch

@@ -1,15 +0,0 @@
-diff -up guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private guile-2.2.7/meta/guile-2.2.pc.in
---- guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private	2016-12-14 18:03:33.000000000 -0600
-+++ guile-2.0.7/meta/guile-2.2.pc.in	2018-02-20 11:53:56.344379283 -0600
-@@ -21,9 +21,9 @@ guile=${bindir}/@guile@
- Name: GNU Guile
- Description: GNU's Ubiquitous Intelligent Language for Extension
- Version: @GUILE_VERSION@
--Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@
-+Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@
- Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@	\
-   @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@		\
-   @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@		\
--  @INET_PTON_LIB@
-+  @INET_PTON_LIB@ @BDW_GC_LIBS@
- Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@

guile.spec

@@ -1,6 +1,6 @@
 Name:          guile
 Version:       2.2.7
-Release:       6
+Release:       1
 Epoch:         5
 Summary:       GNU's Ubiquitous Intelligent Language for Extension
 License:       LGPLv3+
@@ -18,11 +18,9 @@ Patch3: guile-threadstest.patch
 Patch4: disable-out-of-memory-test.patch
 #https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-configure.patch
 Patch5: guile-configure.patch
-#https://src.fedoraproject.org/rpms/guile/blob/rawhide/f/guile-2.0.14-gc_pkgconfig_private.patch
-Patch6000:     guile-2.0.14-gc_pkgconfig_private.patch
 
 BuildRequires: gcc libtool gmp-devel readline-devel gc-devel  libffi-devel
-BuildRequires: gettext-devel libunistring-devel  libtool-ltdl-devel
+BuildRequires: gettext-devel libunistring-devel  libtool-ltdl-devel guile
 Requires:      coreutils
 
 %description
@@ -44,7 +42,6 @@ developing applications that use %{name}.
 %autosetup -n %{name}-%{version} -p1 
 
 %build
-autoreconf -fiv
 %configure --disable-error-on-warning
 sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' libtool
 %make_build
@@ -63,11 +60,13 @@ done
 touch %{buildroot}%{_datadir}/guile/site/%{g_version}/slibcat
 
 ln -s guile %{buildroot}%{_bindir}/guile2
-ln -s guile-tools %{buildroot}%{_bindir}/guile-tools2
+ln -s guile-tools %{buildroot}%{_bindir}/guile2-tools
 
 find %{buildroot}%{_datadir} -name '*.scm' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
 find %{buildroot}%{_libdir} -name '*.go' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
 
+cp -a %{_libdir}/libguile-2.0.so.22* %{buildroot}%{_libdir}
+
 %check
 make  check || true
 
@@ -92,10 +91,11 @@ fi
 %dir %{_datadir}/guile/site/%{g_version}
 %{_bindir}/guild
 %{_bindir}/guile
-%{_bindir}/guile2
+%{_bindir}/guile2*
-%{_bindir}/guile-tools*
+%{_bindir}/guile-tools
 %{_libdir}/guile
 %{_libdir}/libguile-%{g_version}.so.*
+%{_libdir}/libguile-2.0.so.*
 %{_infodir}/guile.info*.gz
 %{_infodir}/r5rs.info.gz
 %ghost %{_datadir}/guile/site/%{g_version}/slibcat
@@ -115,22 +115,6 @@ fi
 %{_mandir}/man1/guile.1.gz
 
 %changelog
-* Mon Aug 19 2024 zhangpan <zhangpan103@h-partners.com> - 5:2.2.7-6
-- backport patch from upstream
-
-* Fri Jul 19 2024 liweigang <liweiganga@uniontech.com> - 5:2.2.7-5
-- fix build error(automake 1.17)
-- regenerate configure file
-
-* Wed Jan 03 2024 konglidong <konglidong@uniontech.com> - 2.2.7-4
-- fix bad macro expansion in changelog
-
-* Sat Apr  8 2023 Z572 <873216071@qq.com> - 2.2.7-3
-- fix guile-tools alias 'guile2-tools' -> 'guile-tools2'
-
-* Mon Feb 20 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.2.7-2
-- delete old so files
-
 * Mon Feb 13 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.2.7-1
 - upgrade to 2.2.7
 
@@ -138,7 +122,7 @@ fi
 - Remove multithreaded builds to resolve binary bep differences
 
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.0.14-17
-- DESC: delete -S git from autosetup, and delete BuildRequires git
+- DESC: delete -S git from %autosetup, and delete BuildRequires git
 
 * Wed Jul 21 2021 yushaogui <yushaogui@huawei.com> - 2.0.14-16
 - delete gdb in buildrequires