rpms/octave/FC-5 octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.32, 1.33 sources, 1.6, 1.7 octave-2.9.4-header.patch, 1.1, NONE octave-2.9.4-x86_64.patch, 1.2, NONE

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Thu Mar 23 22:43:54 UTC 2006


Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1175

Modified Files:
	.cvsignore octave.spec sources 
Added Files:
	octave-2.9.5-sparse.patch 
Removed Files:
	octave-2.9.4-header.patch octave-2.9.4-x86_64.patch 
Log Message:
New upstream release. Lots of spec changes--see changelog.

octave-2.9.5-sparse.patch:

--- NEW FILE octave-2.9.5-sparse.patch ---
Index: liboctave/SparseCmplxQR.h
===================================================================
RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v
retrieving revision 1.2
diff -u -r1.2 SparseCmplxQR.h
--- liboctave/SparseCmplxQR.h   8 Mar 2006 20:17:38 -0000       1.2
+++ liboctave/SparseCmplxQR.h   23 Mar 2006 17:56:07 -0000
@@ -137,6 +137,23 @@
 #endif
 };

+
+// Publish externally used friend functions.
+
+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b,
+                             octave_idx_type &info);
+
+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
+                                   const SparseMatrix &b,
+                                   octave_idx_type &info);
+
+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a,
+                             const ComplexMatrix &b,
+                             octave_idx_type &info);
+
+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
+                                   const SparseComplexMatrix &b,
+                                   octave_idx_type &info);
 #endif

 /*
Index: liboctave/SparseQR.h
===================================================================
RCS file: /cvs/octave/liboctave/SparseQR.h,v
retrieving revision 1.2
diff -u -r1.2 SparseQR.h
--- liboctave/SparseQR.h        8 Mar 2006 20:17:38 -0000       1.2
+++ liboctave/SparseQR.h        23 Mar 2006 17:56:07 -0000
@@ -133,6 +133,22 @@
 #endif
 };

+
+// Publish externally used friend functions.
+
+extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b,
+                      octave_idx_type &info);
+
+extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b,
+                            octave_idx_type &info);
+
+extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b,
+                             octave_idx_type &info);
+
+extern SparseComplexMatrix qrsolve (const SparseMatrix &a,
+                                   const SparseComplexMatrix &b,
+                                   octave_idx_type &info);
+
 #endif

 /*


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Nov 2005 06:02:28 -0000	1.6
+++ .cvsignore	23 Mar 2006 22:43:54 -0000	1.7
@@ -1 +1 @@
-octave-2.9.4.tar.bz2
+octave-2.9.5.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- octave.spec	16 Mar 2006 18:36:26 -0000	1.32
+++ octave.spec	23 Mar 2006 22:43:54 -0000	1.33
@@ -1,14 +1,13 @@
 Name:           octave
-Version:        2.9.4
-Release:        8%{?dist}
+Version:        2.9.5
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0:         octave-2.9.4-header.patch
-Patch1:         octave-2.9.4-x86_64.patch
+Patch0:         octave-2.9.5-sparse.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -18,7 +17,7 @@
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
 BuildRequires:  ncurses-devel zlib-devel libtermcap-devel hdf5-devel
 BuildRequires:  readline-devel glibc-devel fftw-devel autoconf gperf
-BuildRequires:  ufsparse-devel glpk-devel gnuplot
+BuildRequires:  ufsparse-devel glpk-devel gnuplot desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -42,7 +41,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       readline-devel fftw-devel hdf5-devel zlib-devel
-Requires:       lapack-devel blas-devel
+Requires:       lapack-devel blas-devel gcc-c++
 
 %description devel
 The octave-devel package contains files needed for developing
@@ -52,47 +51,53 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
-./autogen.sh
 
 
 %build
 %ifarch x86_64
-%define enable64 --enable-64=yes
+%define enable64 yes
 %else
-%define enable64 --enable-64=no
+%define enable64 no
 %endif
-CPPFLAGS=-I%{_includedir}/glpk \
-CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \
-	--enable-shared --disable-static --prefix=%{_prefix} \
-	--infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir}
-make %{?_smp_mflags}
+export CPPFLAGS=-I%{_includedir}/glpk
+%configure --enable-shared --disable-static --enable-64=%enable64
+make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
 
 
-#empty
-rm -f interpreter/octave.{ky,pg,tp}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f doc/interpreter/munge-texi doc/interpreter/*.o
 strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 # Make library links
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf
 
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R
+# Remove RPM_BUILD_ROOT from ls-R files
+perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R
+perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R
+
+# Clean doc directory
+pushd doc
+  make distclean
+  rm -f *.in */*.in */*.cc refcard/*.tex
+popd
+
+# Create desktop file
+rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
+desktop-file-install --vendor fedora --add-category X-Fedora \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
+
 
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave).		Interactive language for numerical computations." %{_infodir}/octave.info.gz
+/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \
+	--entry="* Octave:(%{name}).	%{summary}." %{_infodir}/octave.info.gz
 
 %preun
 if [ "$1" = "0" ]; then
@@ -105,8 +110,8 @@
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
-%doc SENDING-PATCHES THANKS
-%doc doc/faq doc/liboctave doc/refcard emacs examples
+%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p*
+%doc doc/faq doc/interpreter/HTML doc/refcard
 %{_bindir}/octave
 %{_bindir}/octave-%{version}
 %config(noreplace) /etc/ld.so.conf.d/*
@@ -115,9 +120,11 @@
 %{_libexecdir}/octave
 %{_mandir}/man*/octave*
 %{_infodir}/octave.info*
+%{_datadir}/applications/*
 
 %files devel
 %defattr(-,root,root)
+%doc doc/liboctave
 %{_bindir}/mkoctfile*
 %{_bindir}/octave-bug*
 %{_bindir}/octave-config*
@@ -126,6 +133,13 @@
 
 
 %changelog
+* Thu Mar 23 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
+- New upstream release; remove old patches; add sparse patch.
+- Add gcc-c++ as dependency for devel package.
+- Add more docs; cleanup extra files in docs.
+- Simplify configure command.
+- Install desktop file.
+
 * Fri Feb 24 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-8
 - Rebuild for new hdf5.
 - Remove obsolete configure options.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Nov 2005 06:02:28 -0000	1.6
+++ sources	23 Mar 2006 22:43:54 -0000	1.7
@@ -1 +1 @@
-43561b0d8432847f5eae349c6e89b30a  octave-2.9.4.tar.bz2
+09eff7b2319383778db7bb5e50619bf9  octave-2.9.5.tar.bz2


--- octave-2.9.4-header.patch DELETED ---


--- octave-2.9.4-x86_64.patch DELETED ---




More information about the fedora-extras-commits mailing list