Update to newest upstream release.

2017-04-20 11:23:42 -07:00
4 changed files with 41 additions and 112 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/guile-2.2.*.tar.xz
+/guile-2.2.1.tar.xz
--- a/guile-configure.patch
+++ b/guile-configure.patch
@ -1,21 +0,0 @@
-diff -Nrup a/m4/mathfunc.m4 b/m4/mathfunc.m4
--- a/m4/mathfunc.m4	2016-12-14 17:03:33.000000000 -0700
-+++ b/m4/mathfunc.m4	2020-01-06 19:48:46.684158282 -0700
-@@ -60,7 +60,7 @@ AC_DEFUN([gl_MATHFUNC],
-              #endif
-              #include <math.h>
-              $4
-             $2 (*funcptr) $3 = ]func[;
-+             __attribute__ ((used)) $2 (*funcptr) $3 = ]func[;
-              int i_ret;
-              float f_ret;
-              double d_ret;
-@@ -85,7 +85,7 @@ AC_DEFUN([gl_MATHFUNC],
-                #endif
-                #include <math.h>
-                $4
-               $2 (*funcptr) $3 = ]func[;
-+               __attribute__ ((used)) $2 (*funcptr) $3 = ]func[;
-                int i_ret;
-                float f_ret;
-                double d_ret;
--- a/guile22.spec
+++ b/guile22.spec
@ -1,20 +1,19 @@
 # Guile produces ELF images that are just containers for guile and don't
 # include build-ids. https://wingolog.org/archives/2014/01/19/elf-in-guile
-%undefine _missing_build_ids_terminate_build
+%undefine _missing_build_ids_terminate_build 

 %global mver 2.2

-Name: guile22
-Version: 2.2.7
-Release: 7%{?dist}
 Summary: A GNU implementation of Scheme for application extensibility
+Name: guile22
+Version: 2.2.1
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
 URL: http://www.gnu.org/software/guile/
 License: LGPLv3+
-
 BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
 BuildRequires: gettext-devel libunistring-devel libffi-devel gc-devel
-BuildRequires: make
+Requires(post): /sbin/install-info
 Requires: coreutils

 Provides: bundled(gnulib)
@ -22,7 +21,6 @@ Provides: bundled(gnulib)
 Patch1: guile-multilib.patch
 Patch3: guile-threadstest.patch
 Patch4: disable-out-of-memory-test.patch
-Patch5: guile-configure.patch

 %description
 GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
@ -48,20 +46,23 @@ applications that will be linked to GUILE.  You'll also need to
 install the guile package.

 %prep
-%autosetup -p1 -n guile-%version
+%setup -q -n guile-%version
+%patch1 -p1 -b .multilib
+%patch3 -p1 -b .threadstest
+%patch4 -p1

 %build
-autoreconf -fiv
+
 %configure --disable-static --disable-error-on-warning --program-suffix=%{?mver}

 # Remove RPATH
 sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
    libtool

-%{make_build}
+make %{?_smp_mflags}

 %install
-%{make_install}
+make DESTDIR=$RPM_BUILD_ROOT install

 mkdir -p $RPM_BUILD_ROOT%{_datadir}/guile/site/%{mver}

@ -82,6 +83,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/aclocal/guile{,-%{mver}}.m4
 # Our gdb doesn't support guile yet
 rm -f $RPM_BUILD_ROOT%{_libdir}/libguile*gdb.scm

+# Compress large documentation
+bzip2 NEWS
+
 for i in $RPM_BUILD_ROOT%{_infodir}/goops.info; do
    iconv -f iso8859-1 -t utf-8 < $i > $i.utf8 && mv -f ${i}{.utf8,}
 done
@ -106,6 +110,27 @@ rm $RPM_BUILD_ROOT%{_libdir}/guile/%{mver}/extensions/guile-readline.la
 make %{?_smp_mflags} check


+%post
+/sbin/ldconfig
+for i in guile r5rs; do
+    /sbin/install-info %{_infodir}/${i}-%{mver}.info.gz %{_infodir}/dir &> /dev/null
+done
+:
+
+
+%postun -p /sbin/ldconfig
+
+
+%preun
+if [ "$1" = 0 ]; then
+    for i in guile r5rs; do
+        /sbin/install-info --delete %{_infodir}/${i}-%{mver}.info.gz \
+            %{_infodir}/dir &> /dev/null
+    done
+fi
+:
+
+
 %triggerin -- slib >= 3b4-1
 rm -f %{_datadir}/guile/site/%{mver}/slibcat
 export SCHEME_LIBRARY_PATH=%{_datadir}/slib/
@ -125,7 +150,7 @@ fi

 %files
 %license COPYING COPYING.LESSER LICENSE
-%doc AUTHORS HACKING README THANKS
+%doc AUTHORS HACKING NEWS.bz2 README THANKS
 %{_bindir}/guild%{?mver}
 %{_bindir}/guile%{?mver}
 %{_bindir}/guile-tools%{?mver}
@ -161,87 +186,12 @@ fi


 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 2.2.7-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Nov 24 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2.2.7-1
- Update to 2.2.7
-
-* Wed Aug 19 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.2.6-6
- Drop useless ldconfig scriptlets
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 2.2.6-3
- Fix configure tests compromised by LTO
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 03 2019 Mairi Dulaney <jdulaney@fedoraproject.org> - 2.2.6-1
- Update to latest release
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.4-3
- Rebuild for readline 8.0
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 18 2019 Mairi Dulaney <jdulaney@fedoraproject.org> - 2.2.4-1
- Update to latest release - 2.2.4
-
-* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.2.2-7
- Rebuilt for libcrypt.so.2 (#1666033)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Jul 07 2018 John Dulaney <jdulaney@fedoraproject.org> - 2.2.2-5
- Fix French tests
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.2-4
- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.2.2-2
- Rebuilt for switch to libxcrypt
-
-* Fri Aug 04 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.2-1
- Update to newest upstream release.
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Wed Apr 19 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.1-1
 - Update to newest upstream release.

 * Tue Apr 18 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.0-5
 - Update handling of info files with sed
- update %%post and %%preun
+- update %post and %preun

 * Fri Apr 07 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.0-4
 - Add Provides for bundled gnulib
@ -250,7 +200,7 @@ fi
 * Wed Apr 05 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.0-3
 - Remove extra dash from binarie names
 - Remove symlinks to /usr/bin/guile2{,-tools}
- Remove %%triggerin -- guile and %%postrans should be removed
+- Remove %triggerin -- guile and %postrans should be removed

 * Thu Mar 30 2017 John Dulaney <jdulaney@fedoraproject.org> - 2.2.0-2
 - Split 2.2 out as its own package
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (guile-2.2.7.tar.xz) = 6f60b3489e26f5ff32b55c89316cdcdbf3ec1f4344726006e445f24098c922c50becdc748f1b66d2b271dc002e409ee6210bf85da779cee1f68c9111b3b5c543
+SHA512 (guile-2.2.1.tar.xz) = 6ece521f9828440bf0e848efd1ed7ecb86d80126524950e48fcf03d9010306f467e72e8fb3431d52edab6de837e91d709322399c4d8180f299ddfbc1163ecfa4