From 71c824ec197159d606b0e1b2685ae26babc86d92 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Jul 15 2008 14:41:17 +0000 Subject: - Put include files and libraries in standard paths --- diff --git a/gambit-c.spec b/gambit-c.spec index 9be83e5..187bafb 100644 --- a/gambit-c.spec +++ b/gambit-c.spec @@ -12,7 +12,7 @@ Name: gambit-c Version: 4.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gambit-C Scheme programming system Group: Development/Languages @@ -22,7 +22,7 @@ Source0: http://www.iro.umontreal.ca/~gambit/download/gambit/v4.2/source/ Source1: http://toute.ca/termite080616_0057.tar.gz Source2: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch -Patch1: termite-fix-defrandom.patch +Patch1: termite-fix-defrandom.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: emacs emacs-el @@ -68,12 +68,12 @@ Requires: %{name} = %{version}-%{release} 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} +%package termite-doc +Summary: Examples for the Termite distributed programming system +Group: Documentation +Requires: %{name}-termite = %{version}-%{release} -%description termite-doc +%description termite-doc Termite is an Erlang-like distributed programming system written in Scheme. This package contains examples and benchmarks for Termite. @@ -120,7 +120,8 @@ make check %install rm -rf $RPM_BUILD_ROOT -make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + includedir=$RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in gsc gsi do @@ -156,6 +157,9 @@ 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 @@ -185,8 +189,10 @@ fi %doc LGPL.txt LICENSE-2.0.txt README %exclude %{_bindir}/tsi %{_bindir}/* +%{_includedir}/*.h %exclude %{_libdir}/%{name}/*/lib/termite %{_libdir}/%{name} +%{_libdir}/*.a %files termite %defattr(-,root,root,-) @@ -210,6 +216,9 @@ fi %changelog +* Mon Jul 14 2008 Michel Alexandre Salim - 4.2.8-6 +- Put include files and libraries in standard paths + * Thu Jun 19 2008 Michel Alexandre Salim - 4.2.8-5 - Package Termite as a module instead of bundling a custom Gambit-C with it