- Update to 4.2.9

- Disable Termite for now; still broken
- When built on EL-5, depend directly on emacs binary rather than
    emacs(bin)
This commit is contained in:
Michel Alexandre Salim 2008-10-15 17:21:01 +00:00
parent 32172442b0
commit 1fad8c7e9b
4 changed files with 54 additions and 31 deletions

View File

@ -1,2 +1,2 @@
gambc-v4_2_8.tgz
termite080616_0057.tar.gz
gambc-v4_2_9.tgz
termite080714_2216.tar.gz

View File

@ -1,7 +1,13 @@
%define dirname gambc-v4_2_8
# Build options:
#
# --with termite
# The termite distributed programming system is currently broken
%define dirname gambc-v4_2_9
%define termite_rev 080714_2216
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.2
%define emacs_version 21.4
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
@ -11,18 +17,20 @@
%endif
Name: gambit-c
Version: 4.2.8
Release: 6%{?dist}
Version: 4.2.9
Release: 1%{?dist}
Summary: Gambit-C Scheme programming system
Group: Development/Languages
License: ASL 2.0 or LGPLv2
URL: http://www.iro.umontreal.ca/~gambit
Source0: http://www.iro.umontreal.ca/~gambit/download/gambit/v4.2/source/%{dirname}.tgz
Source1: http://toute.ca/termite080616_0057.tar.gz
%if %{?_with_termite:1}%{!?_with_termite:0}
Source1: http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
%endif
Source2: gambit-init.el
Patch0: gambc-v4_2_8-modtime.patch
Patch1: termite-fix-defrandom.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: emacs emacs-el
@ -57,6 +65,7 @@ with a decent C compiler.
This package contains the Gambit-C user manual in HTML and PDF formats.
%if %{?_with_termite:1}%{!?_with_termite:0}
%package termite
Summary: Termite distributed programming system
Group: Development/Languages
@ -77,12 +86,17 @@ Requires: %{name}-termite = %{version}-%{release}
Termite is an Erlang-like distributed programming system written in Scheme.
This package contains examples and benchmarks for Termite.
%endif
%package -n emacs-gambit
Summary: Gambit-C editing mode for Emacs
Group: Applications/Editors
%if %{?!fedora:7}%{?fedora} >= 8
Requires: emacs(bin) >= %{emacs_version}
%else
Requires: /usr/bin/emacs
%endif
%description -n emacs-gambit
@ -90,11 +104,15 @@ An Emacs mode for editing Gambit-C Scheme source code.
%prep
%if %{?_with_termite:1}%{!?_with_termite:0}
%setup -q -n %{dirname} -a1
%else
%setup -q -n %{dirname}
%endif
%patch0 -p1 -b .modtime
# Not using -b, as the directory content is moved to DESTDIR as a whole
# This way we don't end up with the unpatched file lying around
%patch1 -p0
#patch1 -p0
find . -name '*.scm' | xargs chmod 0644
find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
@ -146,6 +164,10 @@ mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
cp -p misc/gambit.el* $RPM_BUILD_ROOT%{emacs_lispdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
# Link static libs
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .)
%if %{?_with_termite:1}%{!?_with_termite:0}
# Termite
chmod 755 termite termite/examples
chmod -R g+r-w,o+r termite
@ -157,17 +179,16 @@ find benchmarks examples otp -name '*.scm' | xargs \
sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g'
chmod +x otp/gen_event.scm
# Link static libs
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .)
# Move docs
mkdir ../termite-doc ../termite-more-docs
mv CHANGELOG LICENSE README VERSION ../termite-doc
chmod a-x ../termite-doc/* ../termite-more-docs/benchmarks/*
mv benchmarks examples ../termite-more-docs
rm INSTALL
cd ..
mv termite $RPM_BUILD_ROOT%{_libdir}/%{name}/current/lib
%endif
%clean
@ -187,18 +208,24 @@ fi
%files
%defattr(-,root,root,-)
%doc LGPL.txt LICENSE-2.0.txt README
%if %{?_with_termite:1}%{!?_with_termite:0}
%exclude %{_bindir}/tsi
%endif
%{_bindir}/*
%{_includedir}/*.h
%if %{?_with_termite:1}%{!?_with_termite:0}
%exclude %{_libdir}/%{name}/*/lib/termite
%endif
%{_libdir}/%{name}
%{_libdir}/*.a
%if %{?_with_termite:1}%{!?_with_termite:0}
%files termite
%defattr(-,root,root,-)
%doc termite-doc/*
%{_bindir}/tsi
%{_libdir}/%{name}/v%{version}/lib/termite
%endif
%files -n emacs-gambit
%defattr(-,root,root,-)
@ -209,29 +236,36 @@ fi
%doc doc/gambit-c.html doc/gambit-c.pdf examples
%{_infodir}/*
%if %{?_with_termite:1}%{!?_with_termite:0}
%files termite-doc
%defattr(-,root,root,-)
%doc termite-more-docs/*
%endif
%changelog
* Mon Jul 14 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-6
* Tue Oct 14 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.9-1
- Update to 4.2.9
- Disable Termite for now; still broken
- When built on EL-5, depend directly on emacs binary rather than emacs(bin)
* Mon Jul 14 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-6
- Put include files and libraries in standard paths
* Thu Jun 19 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-5
* Thu Jun 19 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-5
- Package Termite as a module instead of bundling a custom Gambit-C with it
* Thu Jun 19 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-4
* Thu Jun 19 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-4
- Permission fixes for Termite subpackage
* Wed Jun 18 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-3
* Wed Jun 18 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-3
- Bundle Termite as a subpackage
* Sat Jun 7 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-2
* Sat Jun 7 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-2
- Rename six symlink to avoid clash with existing six package
* Mon Jun 2 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.2.8-1
* Mon Jun 2 2008 Michel Salim <salimma@fedoraproject.org> - 4.2.8-1
- Update to 4.2.8
- Rename to gambit-c

View File

@ -1,2 +1,2 @@
1ebd2effeb9e936b380d6daffb9e11b8 gambc-v4_2_8.tgz
6a93d860ab819694c25febdbd57e60f3 termite080616_0057.tar.gz
801b06abe43f4e3f015f3251e869ddc5 gambc-v4_2_9.tgz
0aee3d84905bb8a87481eec732dd7ae6 termite080714_2216.tar.gz

View File

@ -1,11 +0,0 @@
--- termite/termite.scm.fix-defrandom 2008-06-16 00:16:49.000000000 -0400
+++ termite/termite.scm 2008-06-19 18:16:48.000000000 -0400
@@ -900,7 +900,7 @@
;; Initialization
(process-links-set! (self) '())
-(random-source-randomize! default-random-source)
+;;(random-source-randomize! default-random-source)
(define (node-init node)
(start-tcp-server (node-port node) start-messenger)