diff --git a/.cvsignore b/.cvsignore index f210478..85f5533 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gcl-2.6.8.tar.bz2 +gcl-2.6.8-info.tar.bz2 diff --git a/gcl.spec b/gcl.spec index 74f2a88..8fe9f71 100644 --- a/gcl.spec +++ b/gcl.spec @@ -28,7 +28,7 @@ Name: gcl Version: 2.6.8 -Release: 0.1.%{alphatag}.1%{?dist} +Release: 0.1.%{alphatag}.2%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -41,6 +41,10 @@ URL: http://www.gnu.org/software/gcl/ # tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8 Source0: gcl-%{version}.tar.bz2 Source1: gcl.el +# This is some info files that are needed for the DESCRIBE function to do +# something useful. These files are present in CVS HEAD (i.e., the upcoming +# 2.7.0 release), but are missing in the 2.6 branch. +Source2: gcl-2.6.8-info.tar.bz2 # This patch was last sent upstream on 29 Dec 2008. It makes GCL use the # sigprocmask API instead of the deprecated sigblock API. Patch0: gcl-2.6.8-sigprocmask-linux.patch @@ -161,6 +165,7 @@ Source Elisp code for XEmacs mode for interacting with GCL %prep %setup -q +%setup -q -T -D -a 2 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -198,6 +203,9 @@ chmod a+x mp/gcclab o/egrep-def utils/replace xbin/* # FIXME: %%{?_smp_mflags} breaks the build make +# Build gcl.info, which is needed for DESCRIBE to work properly +make -C info gcl.info + # dwdoc needs one extra LaTeX run to resolve references cd xgcl-2 pdflatex dwdoc.tex @@ -263,9 +271,15 @@ rm -f /tmp/gazonk_* /tmp/gcl_* %post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : -/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || : -/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir \ + --entry="* gcl: (gcl). GNU Common Lisp Manual." \ + 2>/dev/null || : +/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir \ + --entry="* gcl-si: (gcl-si). GNU Common Lisp System Internals." \ + 2>/dev/null || : +/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \ + --entry="* gcl-tk: (gcl-tk). GNU Common Lisp Tk Manual." \ + 2>/dev/null || : /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || : /sbin/fixfiles -R gcl restore || : @@ -314,6 +328,11 @@ fi %changelog +* Mon Jan 26 2009 Jerry James - 2.6.8-0.1.20080902cvs.2 +- Add missing files required to build gcl.info, which is needed for the + DESCRIBE function to work properly. +- Specify the info entries explicitly, else a mangled version is written. + * Sat Jan 17 2009 Jerry James - 2.6.8-0.1.20080902cvs.1 - ExcludeArch ppc64 for now until I can figure out why it doesn't build diff --git a/sources b/sources index 205de3b..89e4c10 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 6f0453b7f1fb102322cfa69bf2a7275a gcl-2.6.8.tar.bz2 +70b0cf146c7b0dc0f598b98cc7320116 gcl-2.6.8-info.tar.bz2