- added xemacs-octave-mode-pkg

Changed files:
    octave.spec -> 1.27

diff --git a/octave.spec b/octave.spec
index c5b1a57072cc2c2ca408b471f940ab69caf9e486..95411150844db5b9cfd355a63e5361757dc2ccbf 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -6,7 +6,7 @@ Release:        4
 Copyright:     GPL
 Group:         Applications/Math
 Group(pl):     Aplikacje/Matematyczne
-Source:                ftp://ftp.che.wisc.edu/pub/octave/%{name}-%{version}.tar.bz2
+Source0:       ftp://ftp.che.wisc.edu/pub/octave/%{name}-%{version}.tar.bz2
 Patch0:                octave-liboctave.info.patch
 Patch1:                octave-Octave-FAQ.info.patch
 Patch2:                octave-DESTDIR.patch
@@ -22,34 +22,45 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GNU Octave is a high-level language, primarily intended for numerical
-computations. It provides a convenient command line interface for solving
-linear and nonlinear problems numerically, and for performing other
-numerical experiments using a language that is mostly compatible with
-Matlab. It may also be used as a batch-oriented language.
+computations. It provides a convenient command line interface for
+solving linear and nonlinear problems numerically, and for performing
+other numerical experiments using a language that is mostly compatible
+with Matlab. It may also be used as a batch-oriented language.
 
 Octave has extensive tools for solving common numerical linear algebra
-problems, finding the roots of nonlinear equations, integrating ordinary
-functions, manipulating polynomials, and integrating ordinary differential
-and differential-algebraic equations. It is easily extensible and
-customizable via user-defined functions written in Octave's own language, or
-using dynamically loaded modules written in C++, C, Fortran, or other
-languages.
+problems, finding the roots of nonlinear equations, integrating
+ordinary functions, manipulating polynomials, and integrating ordinary
+differential and differential-algebraic equations. It is easily
+extensible and customizable via user-defined functions written in
+Octave's own language, or using dynamically loaded modules written in
+C++, C, Fortran, or other languages.
 
 %description -l pl
 GNU Octave jest jêzykiem programowania wysokiego poziomu przeznaczonym
-g³ównie do obliczeñ numerycznych. Octave jest w du¿ym stopniu kompatybilny z
-jêzykiem Matlab. Pracowaæ mo¿na wprost z linii poleceñ lub uruchamiaæ
-programy stworzone za pomoc± zewnêtrznego edytora.
+g³ównie do obliczeñ numerycznych. Octave jest w du¿ym stopniu
+kompatybilny z jêzykiem Matlab. Pracowaæ mo¿na wprost z linii poleceñ
+lub uruchamiaæ programy stworzone za pomoc± zewnêtrznego edytora.
 
 %package devel
 Summary:       Header files and devel docs for Octave
-Summary(pl):    Pliki nag³ówkowe i dodatkowa dokumentacja Octave 
-Group:          Development/Libraries
-Group(pl):      Programowanie/Biblioteki
+Summary(pl):   Pliki nag³ówkowe i dodatkowa dokumentacja Octave 
+Group:         Development/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
 
 %description -l pl devel
 Pliki nag³ówkowe i dodatkowa dokumentacja Octave
 
+%package -n xemacs-octave-mode-pkg
+Summary:       XEmacs mode for Octave
+Summary(pl):   Tryb edycji plików Octave dla XEmacsa 
+Group:         Applications/Editors/Emacs
+Group(pl):     Aplikacje/Edytory/Emacs
+Requires:      xemacs
+
+%description -l pl -n xemacs-octave-mode-pkg
+Tryb edycji plików Octave dla XEmacsa 
+
 %prep
 %setup -q 
 %patch0 -p1
@@ -83,9 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT \
        octlibdir=$RPM_BUILD_ROOT%{_libdir} \
        octincludedir=$RPM_BUILD_ROOT%{_includedir}/octave \
-       #prefix=$RPM_BUILD_ROOT/usr \
+#prefix=$RPM_BUILD_ROOT%{_prefix} \
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/octave-%{version} $RPM_BUILD_ROOT/usr/bin/octave
+mv -f $RPM_BUILD_ROOT%{_bindir}/octave-%{version} $RPM_BUILD_ROOT%{_bindir}/octave
 
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*so
 
@@ -96,6 +107,19 @@ gzip -9nf $RPM_BUILD_ROOT%{_datadir}/{info/*.info*,man/man1/*} \
        BUGS NEWS* PROJECTS README README.Linux ChangeLog* ROADMAP \
        SENDING-PATCHES THANKS
 
+## xemacs-octave-mode-pkg
+install -d $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/octave-mode
+cp -a emacs/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/octave-mode
+# add otags script or not (additional Requires: ctags)???
+#cp -a emacs/otags $RPM_BUILD_ROOT%{_bindir}
+cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/xemacs-packages/octave-mode/auto-autoloads.el
+(autoload 'run-octave "octave-inf" nil t)
+(autoload 'octave-help "octave-hlp" nil t)
+(autoload 'octave-mode "octave-mod" nil t)
+(setq auto-mode-alist
+      (cons '("\\.m$" . octave-mode) auto-mode-alist))
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.gz emacs examples doc/{interpreter,faq}/*.html
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*so
-%attr(755,root,root) /usr/libexec/octave
+%attr(755,root,root) %{_libdir}exec/octave
 %{_infodir}/octave.info*
 %{_infodir}/Octave-FAQ.info*
 %{_mandir}/man1/*
@@ -128,4 +152,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/refcard/refcard{-a4,}.* doc/liboctave/*.html
 %{_includedir}/%{name}
 %{_infodir}/liboctave.info*
+
+%files -n xemacs-octave-mode-pkg
+%defattr(644,root,root,755)
+%{_datadir}/xemacs-packages/*