rpms/gambit-c/devel termite-fix-defrandom.patch, NONE, 1.1 gambit-c.spec, 1.4, 1.5
Michel Alexandre Salim (salimma)
fedora-extras-commits at redhat.com
Thu Jun 19 22:49:34 UTC 2008
- Previous message (by thread): rpms/hippo-canvas/F-9 .cvsignore, 1.9, 1.10 hippo-canvas.spec, 1.14, 1.15 sources, 1.11, 1.12
- Next message (by thread): rpms/gambit-c/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: salimma
Update of /cvs/pkgs/rpms/gambit-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436
Modified Files:
gambit-c.spec
Added Files:
termite-fix-defrandom.patch
Log Message:
* Thu Jun 19 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 4.2.8-5
- Package Termite as a module instead of bundling a custom Gambit-C with it
termite-fix-defrandom.patch:
--- NEW FILE termite-fix-defrandom.patch ---
--- 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)
Index: gambit-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambit-c/devel/gambit-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gambit-c.spec 19 Jun 2008 17:47:41 -0000 1.4
+++ gambit-c.spec 19 Jun 2008 22:48:50 -0000 1.5
@@ -12,16 +12,17 @@
Name: gambit-c
Version: 4.2.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Gambit-C Scheme programming system
Group: Development/Languages
-License: ASL 2.0 or LGPLv2+
+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
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
@@ -39,22 +40,9 @@
numbers), and complex numbers.
-%package termite
-Summary: Termite distributed programming system
-Group: Development/Languages
-License: ASL 2.0 or LGPLv2+
-URL: http://www.toute.ca/
-# Not requiring base as this really is stand-alone
-
-
-%description termite
-Termite is an Erlang-like distributed programming system written in Scheme.
-
-
%package doc
Summary: Documentation for %{name}
Group: Documentation
-License: ASL 2.0 or LGPLv2+
Requires: %{name} = %{version}-%{release}
Requires(post): info
Requires(preun): info
@@ -69,6 +57,28 @@
This package contains the Gambit-C user manual in HTML and PDF formats.
+%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.
+
+
%package -n emacs-gambit
Summary: Gambit-C editing mode for Emacs
Group: Applications/Editors
@@ -80,8 +90,12 @@
%prep
-%setup -q -n %{dirname}
+%setup -q -n %{dirname} -a1
%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
+
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
@@ -94,27 +108,14 @@
--enable-gcc-opts \
--prefix=%{_libdir}/%{name}
-# Clone the tree for Termite build
-tar cf - * | (mkdir termite && pushd termite && tar xf -)
-
make %{?_smp_mflags}
-pushd termite
-make %{?_smp_mflags} bootstrap
-# Patch Termite into Gambit-C
-(cd lib && tar xf %{SOURCE1} && \
- echo '(##include "termite/termite.scm")' >> _thread.scm
-)
-make %{?_smp_flags}
-popd
-
# Compile emacs module
(cd misc && emacs -batch -f batch-byte-compile gambit.el)
%check
make check
-(cd termite && make check)
%install
@@ -131,46 +132,38 @@
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
+# 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}
-
# Termite
-pushd termite
-make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name}-termite
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-for i in gsc gsi
-do
- ln -sf ../%{_lib}/%{name}-termite/current/bin/$i \
- $RPM_BUILD_ROOT%{_bindir}/$i-termite
-done
-# Just remove doc, info and share/emacs files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-termite/current/doc
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-termite/current/info
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-termite/current/share
-# But package the smaller docs
-for i in CHANGELOG README LICENSE VERSION; do
- chmod 0644 lib/termite/$i
- mv lib/termite/$i ../$i.Termite
-done
+chmod 755 termite termite/examples
+chmod -R g+r-w,o+r termite
+cd termite
+mv tsi $RPM_BUILD_ROOT%{_bindir}
# Fix script interpreters
-(cd lib/termite && chmod 755 benchmarks && chmod 644 benchmarks/* && \
- chmod 755 examples && chmod 644 examples/* && \
- find benchmarks examples -name '*.scm' | xargs \
- sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi-termite|g' && \
- find examples -name '*.sh' | xargs \
- sed -i 's|gsi |gsi-termite |g' )
+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
+mv benchmarks examples ../termite-more-docs
+rm INSTALL
+cd ..
-popd
+mv termite $RPM_BUILD_ROOT%{_libdir}/%{name}/current/lib
%clean
@@ -190,16 +183,16 @@
%files
%defattr(-,root,root,-)
%doc LGPL.txt LICENSE-2.0.txt README
-%exclude %{_bindir}/*-termite
+%exclude %{_bindir}/tsi
%{_bindir}/*
+%exclude %{_libdir}/%{name}/*/lib/termite
%{_libdir}/%{name}
%files termite
%defattr(-,root,root,-)
-%doc CHANGELOG.Termite README.Termite LICENSE.Termite LGPL.txt LICENSE-2.0.txt VERSION.Termite
-%doc termite/lib/termite/examples
-%{_bindir}/*-termite
-%{_libdir}/%{name}-termite
+%doc termite-doc/*
+%{_bindir}/tsi
+%{_libdir}/%{name}/v%{version}/lib/termite
%files -n emacs-gambit
%defattr(-,root,root,-)
@@ -210,9 +203,16 @@
%doc doc/gambit-c.html doc/gambit-c.pdf examples
%{_infodir}/*
+%files termite-doc
+%defattr(-,root,root,-)
+%doc termite-more-docs/*
+
%changelog
+* Thu Jun 19 2008 Michel Alexandre Salim <salimma at 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 at fedoraproject.org> - 4.2.8-4
- Permission fixes for Termite subpackage
- Previous message (by thread): rpms/hippo-canvas/F-9 .cvsignore, 1.9, 1.10 hippo-canvas.spec, 1.14, 1.15 sources, 1.11, 1.12
- Next message (by thread): rpms/gambit-c/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list