rpms/maxima/EL-5 .cvsignore, 1.15, 1.16 maxima.spec, 1.53, 1.54 sources, 1.13, 1.14

Wed Nov 5 17:44:33 UTC 2008

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9297

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
sync w/devel branch (5.16.3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16

--- .cvsignore	9 Jan 2008 05:31:12 -0000	1.15
+++ .cvsignore	5 Nov 2008 17:44:03 -0000	1.16
@@ -2,5 +2,4 @@
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.13.0.tar.gz
-maxima-5.14.0.tar.gz
+maxima-5.16.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/maxima.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- maxima.spec	9 Jan 2008 05:39:47 -0000	1.53
+++ maxima.spec	5 Nov 2008 17:44:03 -0000	1.54
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.14.0
+Version: 5.16.3
 
 Release: 4%{?dist} 
 License: GPLv2
@@ -10,7 +10,13 @@
 Source:	 http://downloads.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ppc sparc
+%if 0%{?fedora} > 8
+
+# reinclude ppc when fixed: http://bugzilla.redhat.com/448734
+ExclusiveArch: i386 x86_64 sparcv9
+%else
+ExclusiveArch: i386 x86_64 ppc sparcv9
+%endif
 
 %define maxima_ver %{version}%{?beta}
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
@@ -19,8 +25,9 @@
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
-%if 0%{?fedora} > 2 && 0%{?fedora} < 9
-%define _enable_gcl --enable-gcl
+%if 0%{?fedora}
+# gcl/f8 bustage on i386: https://bugzilla.redhat.com/show_bug.cgi?id=451801
+#define _enable_gcl --enable-gcl
 %endif
 %endif
 
@@ -44,17 +51,25 @@
 # gcl:   http://bugzilla.redhat.com/167952
 #define _enable_gcl --enable-gcl 
 # sbcl:  http://bugzilla.redhat.com/220053 (resolved)
+# sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
 %endif
 
-%ifarch sparc
+%ifarch sparcv9
 %define default_lisp sbcl
 %define _enable_sbcl --enable-sbcl
 %endif
 
-%if "%{?_enable_gcl}" == "%{nil}"
+%if "x%{?_enable_cmucl}" == "x%{nil}"
+Obsoletes: %{name}-runtime-cmucl < %{version}-%{release}
+%endif
+%if "x%{?_enable_gcl}" == "x%{nil}"
 Obsoletes: %{name}-runtime-gcl < %{version}-%{release}
 %endif
+%if "x%{?_enable_sbcl}" == "x%{nil}"
+Obsoletes: %{name}-runtime-sbcl < %{version}-%{release}
+%endif
+
 
 Source1: maxima.png
 Source2: xmaxima.desktop
@@ -126,7 +141,7 @@
 %description src 
 %{name} lisp source code.
 
-%if "%{?_enable_clisp:1}" == "1"
+%if "x%{?_enable_clisp:1}" == "x1"
 # to workaround mysterious(?) "cpio: MD5 sum mismatch" errors when installing this subpkg
 %define __prelink_undo_cmd %{nil}
 #define _with_clisp_runtime --with-clisp-runtime=%{_libdir}/clisp/base/lisp.run
@@ -142,7 +157,7 @@
 Maxima compiled with Common Lisp (clisp) 
 %endif
 
-%if "%{?_enable_cmucl:1}" == "1"
+%if "x%{?_enable_cmucl:1}" == "x1"
 %define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
@@ -155,7 +170,7 @@
 Maxima compiled with CMU Common Lisp (cmucl) 
 %endif
 
-%if "%{?_enable_gcl:1}" == "1"
+%if "x%{?_enable_gcl:1}" == "x1"
 %package runtime-gcl
 Summary: Maxima compiled with GCL
 Group:   Applications/Engineering
@@ -174,7 +189,7 @@
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
 
-%if "%{?_enable_sbcl:1}" == "1"
+%if "x%{?_enable_sbcl:1}" == "x1"
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
@@ -182,7 +197,7 @@
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
-%if "%{?sbcl_ver}" >= "1.0"
+%if "x%{?sbcl_ver}" != "x%{nil}" 
 Requires: sbcl = %{sbcl_ver}
 %endif
 Requires: %{name} = %{version}
@@ -199,7 +214,7 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%if "%{?setarch_hack}" == "1"
+%if 0%{?setarch_hack} == 1
 %patch6 -p1 -b .gcl-setarch
 %endif
 
@@ -257,7 +272,7 @@
 install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/maxima.png
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir="$RPM_BUILD_ROOT%{_datadir}/applications" \
   --vendor="fedora" \
   %{SOURCE2} 
 
@@ -302,9 +317,11 @@
 
 %post gui
 touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun gui
 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
@@ -332,14 +349,14 @@
  rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
 fi
 
-%triggerin -- tetex-latex
+%triggerin -- tetex-latex,texlive-latex
 if [ -d %{texmf}/tex/latex ]; then
   rm -rf %{texmf}/tex/latex/emaxima ||:
   ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs %{texmf}/tex/latex/emaxima ||:
   %{_bindir}/texhash 2> /dev/null ||:
 fi
 
-%triggerun -- tetex-latex
+%triggerun -- tetex-latex,texlive-latex
 if [ $2 -eq 0 ]; then
   rm -f %{texmf}/tex/latex/emaxima ||:
 fi
@@ -378,6 +395,7 @@
 %{_mandir}/man1/maxima.*
 %dir %{_datadir}/maxima/%{maxima_ver}/emacs
 %{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
+%{_datadir}/maxima/%{maxima_ver}/emacs/imaxima.*
 %{_datadir}/maxima/%{maxima_ver}/emacs/*.el
 %ghost %{_datadir}/maxima/%{maxima_ver}/emacs/*.elc
 %dir %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/
@@ -397,25 +415,25 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
-%if "%{?_enable_clisp:1}" == "1"
+%if "x%{?_enable_clisp:1}" == "x1"
 %files runtime-clisp
 %defattr(-,root,root,-)
 %{_libdir}/maxima/%{maxima_ver}/binary-clisp
 %endif
 
-%if "%{?_enable_cmucl:1}" == "1"
+%if "x%{?_enable_cmucl:1}" == "x1"
 %files runtime-cmucl
 %defattr(-,root,root,-)
 %{_libdir}/maxima/%{maxima_ver}/binary-cmucl
 %endif
 
-%if "%{?_enable_gcl:1}" == "1"
+%if "x%{?_enable_gcl:1}" == "x1"
 %files runtime-gcl
 %defattr(-,root,root,-)
 %{_libdir}/maxima/%{maxima_ver}/binary-gcl
 %endif
 
-%if "%{?_enable_sbcl:1}" == "1"
+%if "x%{?_enable_sbcl:1}" == "x1"
 %files runtime-sbcl
 %defattr(-,root,root,-)
 %{_libdir}/maxima/%{maxima_ver}/binary-sbcl
@@ -423,6 +441,39 @@
 
 
 %changelog
+* Wed Nov 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-4
+- respin (sbcl)
+
+* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-3
+- respin (sbcl)
+
+* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-2
+- respin (sbcl)
+
+* Sun Aug 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-1
+- maxima-5.16.3
+
+* Mon Aug 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.2-1
+- maxima-5.16.2 (5.16 rc)
+
+* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.15.0-3
+- rawhide/rpm hacks/workarounds
+
+* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.15.0-2
+- respin (sbcl)
+
+* Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.15.0-1
+- maxima-5.15.0
+- omit ppc (sbcl, #448734)
+- omit gcl (#451801)
+- touchup scriptlets
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.14.0-6
+- Autorebuild for GCC 4.3
+
+* Mon Jan 28 2008 Rex Dieter <rdieter at fedoraproject.org> 5.14.0-5
+- respin (sbcl)
+
 * Wed Jan 02 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 5.14.0-4
 - x86_64: --disable-gcl (#427250)
 - --disable-gcl (f9+, temporary, until broken deps fixed)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Jan 2008 05:31:12 -0000	1.13
+++ sources	5 Nov 2008 17:44:03 -0000	1.14
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-8afd0efee916c983d875a396ec405ad2  maxima-5.14.0.tar.gz
+690ee57f3884f565c898ed39a592e4e1  maxima-5.16.3.tar.gz


