rpms/maxima/FC-5 .cvsignore, 1.5, 1.6 maxima.spec, 1.25, 1.26 sources, 1.5, 1.6 maxima-5.9.2-evince.patch, 1.1, NONE maxima-5.9.3-gcl-setarch.patch, 1.1, NONE maxima-5.9.3-sbcl-disable-debugger.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Sep 19 11:48:04 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10757
Modified Files:
.cvsignore maxima.spec sources
Removed Files:
maxima-5.9.2-evince.patch maxima-5.9.3-gcl-setarch.patch
maxima-5.9.3-sbcl-disable-debugger.patch
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.9.rc4
- build for new(er) sbcl (#207063)
- 5.9.3.99rc4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 10 Apr 2006 17:31:33 -0000 1.5
+++ .cvsignore 19 Sep 2006 11:48:04 -0000 1.6
@@ -1,3 +1,5 @@
maximabook-19-Sept-2004.pdf
macref.pdf
maxima-5.9.3.tar.gz
+maxima-5.9.3.99rc3.tar.gz
+maxima-5.9.3.99rc4.tar.gz
Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maxima.spec 9 Jul 2006 19:14:58 -0000 1.25
+++ maxima.spec 19 Sep 2006 11:48:04 -0000 1.26
@@ -1,16 +1,23 @@
+%define beta rc4
+
+%define emacs_sitelisp %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
+
Summary: Symbolic Computation Program
Name: maxima
-Version: 5.9.3
+Version: 5.9.3.99
-Release: 5%{?dist}
+Release: 0.9.%{beta}%{?dist}
License: GPL
Group: Applications/Engineering
URL: http://maxima.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
+Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: %{ix86} x86_64 ppc
+%define maxima_ver %{version}%{?beta}
+
%ifarch %{ix86}
%define _enable_cmucl --enable-cmucl
%endif
@@ -24,9 +31,9 @@
%ifarch ppc
%define default_lisp sbcl
-# clisp: http://bugzilla.redhat.com/bugzilla/166347
+# clisp: http://bugzilla.redhat.com/166347
#define _enable_clisp --enable-clisp
-# gcl: http://bugzilla.redhat.com/bugzilla/167952
+# gcl: http://bugzilla.redhat.com/167952
#define _enable_gcl --enable-gcl
%define _enable_sbcl --enable-sbcl
%endif
@@ -43,13 +50,13 @@
# (mysterious?) xemacs patch (don't use, for now)
Patch2: maxima.el-xemacs.patch
# use sbcl --disable-debugger
-Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
# ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.2-evince.patch
+Patch4: maxima-5.9.4-evince.patch
# emaxima fix from Camm Maguire
Patch5: maxima-5.9.2-emaxima.patch
# maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
-Patch6: maxima-5.9.3-gcl-setarch.patch
+Patch6: maxima-5.9.4-gcl_setarch.patch
# Inhibit automatic compressing of info files. Compressed info
# files break maxima's internal help.
@@ -137,7 +144,7 @@
BuildRequires: gcl
Requires: %{name} = %{version}
%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
+# See http://bugzilla.redhat.com/187647
%define setarch_hack 1
BuildRequires: setarch
Requires: setarch
@@ -158,9 +165,8 @@
# this hack should work, even in mock (-: -- Rex
%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
%if "%{?sbcl_ver}" >= "0.9"
-%define sbcl_ver2 >= %{sbcl_ver}
+Requires: sbcl = %{sbcl_ver}
%endif
-Requires: sbcl %{?sbcl_ver2}
Requires: %{name} = %{version}
Obsoletes: maxima-exec-sbcl < %{version}-%{release}
Provides: %{name}-runtime = %{version}
@@ -170,7 +176,7 @@
%prep
-%setup -q -n %{name}%{!?cvs:-%{version}}
+%setup -q -n %{name}%{!?cvs:-%{version}%{?beta}}
# Extra docs
install -p -m644 %{SOURCE10} .
@@ -213,9 +219,9 @@
install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
- pushd info
- texi2dvi --pdf maxima.texi
- popd
+# pushd info
+# texi2dvi --pdf maxima.texi
+# popd
pushd intromax
pdflatex intromax.ltx
@@ -236,39 +242,34 @@
# app icon
install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/maxima.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category "X-Fedora" \
+ --add-category "X-Fedora" --vendor="fedora" \
%{SOURCE2}
-## emaxima
-# LaTeX style
+# emaxima LaTeX style
install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.sty \
$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
-# emacs
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
- $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
- $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
-
-# xemacs
-install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
- $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
- $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
+# (x)emacs
+install -D -m644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el
+
+for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
+ install -d -m755 $RPM_BUILD_ROOT$dir/{,site-start.d}
+ ln -s %{_datadir}/maxima/%{maxima_ver}/emacs $RPM_BUILD_ROOT$dir/maxima
+ for file in $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.el ; do
+ touch `dirname $file`/`basename $file .el`.elc
+ done
+ ln -s %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el $RPM_BUILD_ROOT$dir/site-start.d/
+ touch $RPM_BUILD_ROOT$dir/site-start.d/maxima-modes.elc
+done
## unwanted/unpackaged files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
# docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
# _enable_gcl: debuginfo (sometimes?) fails to get auto-created, so we'll help out
touch debugfiles.list
@@ -292,6 +293,26 @@
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%triggerin -- emacs-common
+if [ -d %{emacs_sitelisp} ]; then
+ rm -rf %{emacs_sitelisp}/maxima
+ ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs %{emacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{emacs_sitelisp}/site-start.d/ ||:
+
+%triggerin -- xemacs-common
+if [ -d %{xemacs_sitelisp} ]; then
+ rm -rf %{xemacs_sitelisp}/maxima
+ ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs %{xemacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
+
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
+
%clean
@@ -300,72 +321,95 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.lisps
+%doc AUTHORS ChangeLog COPYING README README.lisps
%doc doc/misc/ doc/implementation/
%doc doc/intromax/intromax.pdf
%doc doc/maximabook/maxima.pdf
%doc macref.pdf
-%doc %{_datadir}/maxima/%{version}/doc
%{_bindir}/maxima
%dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}
-%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}/demo/
-%{_datadir}/maxima/%{version}/share/
+%dir %{_datadir}/maxima/%{maxima_ver}
+%{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{maxima_ver}/demo/
+%doc %{_datadir}/maxima/%{maxima_ver}/doc
+%{_datadir}/maxima/%{maxima_ver}/share/
+%dir %{_libdir}/maxima/
+%dir %{_libdir}/maxima/%{maxima_ver}/
%{_libexecdir}/maxima
%{_infodir}/*.info*
%{_mandir}/man1/maxima.*
-# emaxima
-%{_datadir}/maxima/%{version}/emacs
-%{_datadir}/emacs/site-lisp/*
-%{_datadir}/xemacs/site-packages/*
%{_datadir}/texmf/tex/latex/emaxima/
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs
+%{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
+%{_datadir}/maxima/%{maxima_ver}/emacs/*.el
+%ghost %{_datadir}/maxima/%{maxima_ver}/emacs/*.elc
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/
+%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/*.el
+%ghost %{emacs_sitelisp}
+%ghost %{xemacs_sitelisp}
%files src
%defattr(-,root,root,-)
-%{_datadir}/maxima/%{version}/src/
+%{_datadir}/maxima/%{maxima_ver}/src/
%files gui
%defattr(-,root,root,-)
%{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}/xmaxima
+%{_datadir}/maxima/%{maxima_ver}/xmaxima/
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/*/*
%if "%{?_enable_clisp:1}" == "1"
%files runtime-clisp
%defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-clisp
+%{_libdir}/maxima/%{maxima_ver}/binary-clisp
%endif
%if "%{?_enable_cmucl:1}" == "1"
%files runtime-cmucl
%defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-cmucl
+%{_libdir}/maxima/%{maxima_ver}/binary-cmucl
%endif
%if "%{?_enable_gcl:1}" == "1"
%files runtime-gcl
%defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-gcl
+%{_libdir}/maxima/%{maxima_ver}/binary-gcl
%endif
%if "%{?_enable_sbcl:1}" == "1"
%files runtime-sbcl
%defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-sbcl
+%{_libdir}/maxima/%{maxima_ver}/binary-sbcl
%endif
%changelog
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.9.rc4
+- respin for new(er) sbcl (#207063)
+
+* Wed Sep 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.8.rc4
+- 5.9.3.99rc4
+
+* Wed Sep 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.7.rc3
+- 5.9.3.99rc3
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.6.rc2
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.5.rc2
+- respin (against newer sbcl)
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.4.rc2
+- update gcl_setarch patch
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.3.rc2
+- 5.9.3.99rc2
+
+* Tue Aug 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.1.rc1
+- 5.9.3.99rc1
+- - %ghost (x)emacs site-lisp bits (hint from fedora-rpmdevtools)
+
* Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-5
- respin for sbcl-0.9.14 (and relax Requires = to >= )
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 10 Apr 2006 17:31:33 -0000 1.5
+++ sources 19 Sep 2006 11:48:04 -0000 1.6
@@ -1,3 +1,3 @@
9faa5a513de43b5e7384216a8783f620 maximabook-19-Sept-2004.pdf
c101a1ce604d31b02bbc2f37cced280d macref.pdf
-e6388632d91722bb0607914bdabc72f6 maxima-5.9.3.tar.gz
+9950ed2369314fcbb3ad1e090a40c7d7 maxima-5.9.3.99rc4.tar.gz
--- maxima-5.9.2-evince.patch DELETED ---
--- maxima-5.9.3-gcl-setarch.patch DELETED ---
--- maxima-5.9.3-sbcl-disable-debugger.patch DELETED ---
More information about the fedora-extras-commits
mailing list