From 0e8e0bd4f021310ac5ff79e1c1f4b1d8c1583654 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 29 Mar 2012 17:30:23 +0700 Subject: [PATCH] Update to 4.6.5 - Drop termite subpackages, they have been disabled for many releases --- .gitignore | 2 +- gambit-c.spec | 107 +++++--------------------------------------------- sources | 2 +- 3 files changed, 11 insertions(+), 100 deletions(-) diff --git a/.gitignore b/.gitignore index 49f9eb4..0fda93d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gambc-v4_6_4-devel.tgz +/gambc-v4_6_5-devel.tgz diff --git a/gambit-c.spec b/gambit-c.spec index 6dbd2a3..0b9bbe6 100644 --- a/gambit-c.spec +++ b/gambit-c.spec @@ -1,13 +1,7 @@ -# Build options: -# -# --with termite -# The termite distributed programming system is currently broken - -%global dirname gambc-v4_6_4-devel -%global termite_rev 080714_2216 +%global dirname gambc-v4_6_5-devel Name: gambit-c -Version: 4.6.4 +Version: 4.6.5 Release: 1%{?dist} Summary: Scheme programming system @@ -15,14 +9,7 @@ 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.6/source/%{dirname}.tgz - -%if %{?_with_termite:1}%{!?_with_termite:0} -Source1: http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz -%else -Provides: gambit-c-termite = %{version}-%{release} -Obsoletes: gambit-c-termite < %{version}-%{release} -%endif -Source2: gambit-init.el +Source1: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch BuildRequires: emacs @@ -50,11 +37,6 @@ Requires(post): info Requires(preun): info # switch to noarch Obsoletes: gambit-c-doc < %{version}-%{release} -%if %{?_with_termite:0}%{!?_with_termite:1} -Provides: gambit-c-termite-doc = %{version}-%{release} -Obsoletes: gambit-c-termite-doc < %{version}-%{release} -%endif - %description doc Gambit-C includes a Scheme interpreter and a Scheme compiler which can @@ -65,30 +47,6 @@ 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 -URL: http://www.toute.ca/ -Requires: %{name} = %{version}-%{release} - - -%description termite -Termite is an Erlang-like distributed programming system written in Scheme. - - -%package termite-doc -Summary: Examples for the Termite distributed programming system -Group: Documentation -Requires: %{name}-termite = %{version}-%{release} - -%description termite-doc -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 @@ -111,22 +69,14 @@ Elisp source file for the Gambit-C editing mode for Emacs. %prep -%if %{?_with_termite:1}%{!?_with_termite:0} -%setup -q -n %{dirname} -a1 -%else %setup -q -n %{dirname} -%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' 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} +chmod -x lib/*.{c,h} %build @@ -165,34 +115,11 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/doc # Emacs mode files 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} +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir} # Link static libs (cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/*.a .) -%if %{?_with_termite:1}%{!?_with_termite:0} -# Termite -chmod 755 termite termite/examples -chmod -R g+r-w,o+r termite -cd termite -mv tsi $RPM_BUILD_ROOT%{_bindir} - -# Fix script interpreters -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 - -# 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 rm -rf $RPM_BUILD_ROOT @@ -211,26 +138,12 @@ 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 %{_mandir}/man1/gsi.* -%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,-) %doc LGPL.txt LICENSE-2.0.txt @@ -248,15 +161,13 @@ fi # examples %{_infodir}/* -%if %{?_with_termite:1}%{!?_with_termite:0} -%files termite-doc -%defattr(-,root,root,-) -%doc termite-more-docs/* -%endif - %changelog +* Thu Mar 29 2012 Michel Salim - 4.6.5-1 +- Update to 4.6.5 +- Drop termite subpackages, they have been disabled for many releases + * Wed Feb 15 2012 Michel Salim - 4.6.4-1 - Update to 4.6.4 diff --git a/sources b/sources index f87de73..4e1924d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5a546032468a0abc3bab7af64ae5623 gambc-v4_6_4-devel.tgz +84fde5c6f60cb37b7b46cfb1b2996a9d gambc-v4_6_5-devel.tgz