- Update to 4.6.0

- Bundle license text with independent Emacs subpackage
This commit is contained in:
Michel Alexandre Salim 2010-07-12 09:39:57 +00:00
parent 9bb4daf1f3
commit 1f56c22343
3 changed files with 54 additions and 42 deletions

View File

@ -1 +1 @@
gambc-v4_3_2-devel.tgz
gambc-v4_6_0-devel.tgz

View File

@ -3,27 +3,18 @@
# --with termite
# The termite distributed programming system is currently broken
%define dirname gambc-v4_3_2-devel
%define dirname gambc-v4_6_0-devel
%define termite_rev 080714_2216
%if %($(pkg-config emacs) ; echo $?)
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif
Name: gambit-c
Version: 4.3.2
Release: 4%{?dist}
Summary: Gambit-C Scheme programming system
Version: 4.6.0
Release: 1%{?dist}
Summary: 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.3/source/%{dirname}.tgz
Source0: http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/%{dirname}.tgz
%if %{?_with_termite:1}%{!?_with_termite:0}
Source1: http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
@ -35,7 +26,7 @@ Source2: gambit-init.el
Patch0: gambc-v4_2_8-modtime.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: emacs emacs-el
BuildRequires: emacs
Requires: gcc
%description
@ -53,6 +44,8 @@ numbers), and complex numbers.
%package doc
Summary: Documentation for %{name}
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires(post): info
Requires(preun): info
@ -98,16 +91,23 @@ This package contains examples and benchmarks for Termite.
%package -n emacs-gambit
Summary: Gambit-C editing mode for Emacs
Group: Applications/Editors
%if 0%{?rhel}
Requires: emacs >= 21.4
%else
Requires: emacs(bin) >= %{emacs_version}
%endif
BuildArch: noarch
Requires: emacs(bin) >= %{_emacs_version}
%description -n emacs-gambit
An Emacs mode for editing Gambit-C Scheme source code.
%package -n emacs-gambit-el
Summary: Elisp source file for emacs-gambit
Group: Applications/Editors
BuildArch: noarch
Requires: emacs-gambit = %{version}-%{release}
%description -n emacs-gambit-el
Elisp source file for the Gambit-C editing mode for Emacs.
%prep
%if %{?_with_termite:1}%{!?_with_termite:0}
@ -117,9 +117,13 @@ An Emacs mode for editing Gambit-C Scheme source code.
%endif
%patch0 -p1 -b .modtime
find . -name '*.scm' | xargs chmod 0644
find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
sed -i "s|\xE9|\xC3\xA9|g" doc/gambit-c.info-2
#find . -name '*.scm' | xargs chmod 0644
#find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
touch -r doc/gambit-c.info-2{,.tstamp}
iconv -f iso88591 -t utf8 doc/gambit-c.info-2 -o doc/gambit-c.info-2.utf8
touch -r doc/gambit-c.info-2{,.utf8}
mv doc/gambit-c.info-2{.utf8,}
#sed -i "s|\xE9|\xC3\xA9|g" doc/gambit-c.info-2
# Permission fixes
chmod -x lib/{mem.c,setup.h}
@ -127,7 +131,8 @@ chmod -x lib/{mem.c,setup.h}
%build
%configure --enable-single-host \
--enable-gcc-opts \
--prefix=%{_libdir}/%{name}
--bindir=%{_libdir}/%{name}/bin \
--libdir=%{_libdir}/%{name}
make %{?_smp_mflags}
@ -141,34 +146,28 @@ make check
%install
rm -rf $RPM_BUILD_ROOT
make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \
includedir=$RPM_BUILD_ROOT%{_includedir}
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
for i in gsc gsi
do
ln -sf ../%{_lib}/%{name}/current/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
ln -sf ../%{_lib}/%{name}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
done
cat > $RPM_BUILD_ROOT%{_bindir}/gsix <<EOF
#!/bin/sh
%{_libdir}/%{name}/current/bin/six $@
%{_libdir}/%{name}/bin/six $@
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/gsix
# Remove duplicate docs
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/current/doc
mkdir -p $RPM_BUILD_ROOT%{_infodir}
cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/current/info/* $RPM_BUILD_ROOT%{_infodir}
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/current/info
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/current/share
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
# Emacs mode files
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
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}
mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
cp -p misc/gambit.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
# Link static libs
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/current/lib/*.a .)
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/*.a .)
%if %{?_with_termite:1}%{!?_with_termite:0}
# Termite
@ -216,6 +215,7 @@ fi
%endif
%{_bindir}/*
%{_includedir}/*.h
%{_mandir}/man1/gsi.*
%if %{?_with_termite:1}%{!?_with_termite:0}
%exclude %{_libdir}/%{name}/*/lib/termite
%endif
@ -232,11 +232,19 @@ fi
%files -n emacs-gambit
%defattr(-,root,root,-)
%{emacs_lispdir}/*
%doc LGPL.txt LICENSE-2.0.txt
%{_emacs_sitelispdir}/*.elc
%{_emacs_sitestartdir}/gambit-init.el
%files -n emacs-gambit-el
%defattr(-,root,root,-)
%{_emacs_sitelispdir}/*.el
%files doc
%defattr(-,root,root,-)
%doc doc/gambit-c.html doc/gambit-c.pdf examples
%doc doc/gambit-c.html doc/gambit-c.pdf
# don't package examples until makefiles are fixed
# examples
%{_infodir}/*
%if %{?_with_termite:1}%{!?_with_termite:0}
@ -248,6 +256,10 @@ fi
%changelog
* Mon Jul 12 2010 Michel Salim <salimma@fedoraproject.org> - 4.6.0-1
- Update to 4.6.0
- Bundle license text with independent Emacs subpackage
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

View File

@ -1 +1 @@
2470faaccd3e91142dfc204fda5f3c96 gambc-v4_3_2-devel.tgz
7b5556cb864bfa00de13e12e34e9f6c9 gambc-v4_6_0-devel.tgz