- make noarch -doc subpackage properly obsolete its arched predecessor
- update stable branches to 4.6.0
This commit is contained in:
parent
c7ad46e605
commit
e9c03b39a4
@ -1 +1 @@
|
|||||||
gambc-v4_3_2-devel.tgz
|
gambc-v4_6_0-devel.tgz
|
||||||
|
@ -3,27 +3,18 @@
|
|||||||
# --with termite
|
# --with termite
|
||||||
# The termite distributed programming system is currently broken
|
# 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
|
%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
|
Name: gambit-c
|
||||||
Version: 4.3.2
|
Version: 4.6.0
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Gambit-C Scheme programming system
|
Summary: Scheme programming system
|
||||||
|
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: ASL 2.0 or LGPLv2
|
License: ASL 2.0 or LGPLv2
|
||||||
URL: http://www.iro.umontreal.ca/~gambit
|
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}
|
%if %{?_with_termite:1}%{!?_with_termite:0}
|
||||||
Source1: http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
|
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
|
Patch0: gambc-v4_2_8-modtime.patch
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
BuildRequires: emacs emacs-el
|
BuildRequires: emacs
|
||||||
Requires: gcc
|
Requires: gcc
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -53,9 +44,13 @@ numbers), and complex numbers.
|
|||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation for %{name}
|
Summary: Documentation for %{name}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires(post): info
|
Requires(post): info
|
||||||
Requires(preun): info
|
Requires(preun): info
|
||||||
|
# switch to noarch
|
||||||
|
Obsoletes: gambit-c-doc < %{version}-%{release}
|
||||||
%if %{?_with_termite:0}%{!?_with_termite:1}
|
%if %{?_with_termite:0}%{!?_with_termite:1}
|
||||||
Provides: gambit-c-termite-doc = %{version}-%{release}
|
Provides: gambit-c-termite-doc = %{version}-%{release}
|
||||||
Obsoletes: gambit-c-termite-doc < %{version}-%{release}
|
Obsoletes: gambit-c-termite-doc < %{version}-%{release}
|
||||||
@ -98,16 +93,23 @@ This package contains examples and benchmarks for Termite.
|
|||||||
%package -n emacs-gambit
|
%package -n emacs-gambit
|
||||||
Summary: Gambit-C editing mode for Emacs
|
Summary: Gambit-C editing mode for Emacs
|
||||||
Group: Applications/Editors
|
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
|
%description -n emacs-gambit
|
||||||
An Emacs mode for editing Gambit-C Scheme source code.
|
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
|
%prep
|
||||||
%if %{?_with_termite:1}%{!?_with_termite:0}
|
%if %{?_with_termite:1}%{!?_with_termite:0}
|
||||||
@ -117,9 +119,13 @@ An Emacs mode for editing Gambit-C Scheme source code.
|
|||||||
%endif
|
%endif
|
||||||
%patch0 -p1 -b .modtime
|
%patch0 -p1 -b .modtime
|
||||||
|
|
||||||
find . -name '*.scm' | xargs chmod 0644
|
#find . -name '*.scm' | xargs chmod 0644
|
||||||
find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
|
#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
|
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
|
# Permission fixes
|
||||||
chmod -x lib/{mem.c,setup.h}
|
chmod -x lib/{mem.c,setup.h}
|
||||||
|
|
||||||
@ -127,7 +133,8 @@ chmod -x lib/{mem.c,setup.h}
|
|||||||
%build
|
%build
|
||||||
%configure --enable-single-host \
|
%configure --enable-single-host \
|
||||||
--enable-gcc-opts \
|
--enable-gcc-opts \
|
||||||
--prefix=%{_libdir}/%{name}
|
--bindir=%{_libdir}/%{name}/bin \
|
||||||
|
--libdir=%{_libdir}/%{name}
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
@ -141,34 +148,28 @@ make check
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install prefix=$RPM_BUILD_ROOT%{_libdir}/%{name} \
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
includedir=$RPM_BUILD_ROOT%{_includedir}
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||||
for i in gsc gsi
|
for i in gsc gsi
|
||||||
do
|
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
|
done
|
||||||
cat > $RPM_BUILD_ROOT%{_bindir}/gsix <<EOF
|
cat > $RPM_BUILD_ROOT%{_bindir}/gsix <<EOF
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
%{_libdir}/%{name}/current/bin/six $@
|
%{_libdir}/%{name}/bin/six $@
|
||||||
EOF
|
EOF
|
||||||
chmod +x $RPM_BUILD_ROOT%{_bindir}/gsix
|
chmod +x $RPM_BUILD_ROOT%{_bindir}/gsix
|
||||||
|
|
||||||
# Remove duplicate docs
|
# Remove duplicate docs
|
||||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/current/doc
|
rm -rf $RPM_BUILD_ROOT%{_prefix}/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
|
# Emacs mode files
|
||||||
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
|
mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
|
cp -p misc/gambit.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}
|
||||||
cp -p misc/gambit.el* $RPM_BUILD_ROOT%{emacs_lispdir}
|
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
|
||||||
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
|
|
||||||
|
|
||||||
# Link static libs
|
# 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}
|
%if %{?_with_termite:1}%{!?_with_termite:0}
|
||||||
# Termite
|
# Termite
|
||||||
@ -216,6 +217,7 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_includedir}/*.h
|
%{_includedir}/*.h
|
||||||
|
%{_mandir}/man1/gsi.*
|
||||||
%if %{?_with_termite:1}%{!?_with_termite:0}
|
%if %{?_with_termite:1}%{!?_with_termite:0}
|
||||||
%exclude %{_libdir}/%{name}/*/lib/termite
|
%exclude %{_libdir}/%{name}/*/lib/termite
|
||||||
%endif
|
%endif
|
||||||
@ -232,11 +234,19 @@ fi
|
|||||||
|
|
||||||
%files -n emacs-gambit
|
%files -n emacs-gambit
|
||||||
%defattr(-,root,root,-)
|
%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
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
%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}/*
|
%{_infodir}/*
|
||||||
|
|
||||||
%if %{?_with_termite:1}%{!?_with_termite:0}
|
%if %{?_with_termite:1}%{!?_with_termite:0}
|
||||||
@ -248,6 +258,13 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 12 2010 Michel Salim <salimma@fedoraproject.org> - 4.6.0-2
|
||||||
|
- noarch -doc subpackage properly obsoletes older, arched variant
|
||||||
|
|
||||||
|
* 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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user