[octave-optim] import from review

sailer sailer at fedoraproject.org
Fri Aug 26 14:36:34 UTC 2011


commit c400fe7475919e465308ad0fa3dc22e2d7df59de
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Fri Aug 26 16:33:32 2011 +0200

    import from review

 .gitignore                 |    1 +
 octave-optim-fsf.patch     |   22 +++++++++++
 octave-optim-nostrip.patch |   11 +++++
 octave-optim.spec          |   89 ++++++++++++++++++++++++++++++++++++++++++++
 sources                    |    1 +
 5 files changed, 124 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b182db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/optim-1.0.16.tar.gz
diff --git a/octave-optim-fsf.patch b/octave-optim-fsf.patch
new file mode 100644
index 0000000..bbe4c2e
--- /dev/null
+++ b/octave-optim-fsf.patch
@@ -0,0 +1,22 @@
+--- inst/gjp.m.fsf	2011-06-05 17:03:55.000000000 +0200
++++ inst/gjp.m	2011-06-05 17:04:37.000000000 +0200
+@@ -12,7 +12,7 @@
+ %%
+ %% You should have received a copy of the GNU General Public License
+ %% along with this program; if not, write to the Free Software
+-%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307USA
++%% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 
+ function m = gjp (m, k, l)
+ 
+--- inst/cpiv_bard.m.fsf	2011-06-05 17:04:01.000000000 +0200
++++ inst/cpiv_bard.m	2011-06-05 17:04:44.000000000 +0200
+@@ -12,7 +12,7 @@
+ %%
+ %% You should have received a copy of the GNU General Public License
+ %% along with this program; if not, write to the Free Software
+-%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307USA
++%% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 
+ function [lb, idx, ridx, m] = cpiv_bard (v, m, incl)
+ 
diff --git a/octave-optim-nostrip.patch b/octave-optim-nostrip.patch
new file mode 100644
index 0000000..35966a6
--- /dev/null
+++ b/octave-optim-nostrip.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.nostrip	2011-01-24 18:45:50.000000000 +0100
++++ src/Makefile	2011-06-05 18:59:48.000000000 +0200
+@@ -5,7 +5,7 @@
+ all: __bfgsmin.oct numgradient.oct numhessian.oct samin.oct
+ 
+ %.oct: %.cc
+-	$(MKOCTFILE) -s $<
++	$(MKOCTFILE) -v $<
+ 
+ clean:
+ 	-rm *.o core octave-core *.oct *~
diff --git a/octave-optim.spec b/octave-optim.spec
new file mode 100644
index 0000000..9abcafa
--- /dev/null
+++ b/octave-optim.spec
@@ -0,0 +1,89 @@
+%global octpkg optim
+
+Name:           octave-%{octpkg}
+Version:        1.0.16
+Release:        3%{?dist}
+Summary:        A non-linear optimization tool kit for Octave
+Group:          Applications/Engineering
+License:        GPLv2+ and GPLv3+ and GFDL
+URL:            http://octave.sourceforge.net/optim/
+Source0:        http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+# update outdated FSF address
+# http://sourceforge.net/mailarchive/forum.php?thread_name=1307997599.17845.9.camel%40unreal.home.sailer.dynip.lugs.ch&forum_name=octave-dev
+Patch0:         %{name}-fsf.patch
+# avoid stripping binaries to get useful debuginfo packages
+# fedora specific - not upstreamed
+Patch1:         %{name}-nostrip.patch
+
+BuildRequires:  octave-devel
+BuildRequires:  octave-miscellaneous >= 1.0.11
+BuildRequires:  octave-struct >= 1.0.9 
+BuildRequires:  tex(latex)
+
+Requires:       octave(api) = %{octave_api}
+Requires(post): octave
+Requires(postun): octave
+Requires:       octave-miscellaneous >= 1.0.11
+Requires:       octave-struct >= 1.0.9 
+
+Obsoletes:      octave-forge <= 20090607
+
+
+%description
+This package contains a non-linear optimization tool kit for Octave, containing
+functions for curve fitting and the following minimization algorithms:
+* Nead-Miller simplex
+* Conjugate Gradients
+* Memory limited BFGS
+* Simulated Annealing
+
+%prep
+%setup -q -n %{octpkg}-%{version}
+%patch0 -p0
+%patch1 -p0 -b .nostrip
+
+%build
+#octave pkg build dependency check does not work
+#https://bugzilla.redhat.com/show_bug.cgi?id=733615
+#octave_pkg_build
+%octave_cmd pkg build '-verbose' '-nodeps' %{_tmppath}/%{name}-%{version}-%{release}.%{_arch} %{_builddir}/%{buildsubdir}
+make -C doc DVIPDF=dvipdf optim-mini-howto-2.pdf
+
+%install
+rm -rf %{buildroot}
+%octave_pkg_install
+rm -rf %{buildroot}/%{octpkgdir}/doc/.svnignore
+chmod a-x %{buildroot}/%{octpkgdir}/*.m
+rm -rf  %{buildroot}/%{octpkgdir}/doc
+
+%post
+%octave_cmd pkg rebuild
+
+%preun
+%octave_pkg_preun
+
+%postun
+%octave_cmd pkg rebuild
+
+%files
+%defattr(-,root,root,-)
+
+%dir %{octpkgdir}
+%doc %{octpkgdir}/doc-cache
+%{octpkgdir}/*.m
+%{octpkgdir}/packinfo
+%doc %{octpkgdir}/packinfo/COPYING
+%{octpkglibdir}
+%{octpkgdir}/PKG_ADD
+%{octpkgdir}/private/optim_problems_p_r_y.data
+%doc doc/optim-mini-howto-2.pdf doc/development/interfaces.txt
+
+%changelog
+* Fri Aug 26 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.0.16-3
+- compile tex docs into a pdf file instead of shipping tex sources
+
+* Wed Aug 24 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.0.16-2
+- review input
+
+* Fri Jun 03 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> 1.0.16-1
+- initial package for Fedora
diff --git a/sources b/sources
index e69de29..ea7297c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a0ed1c8bbd7d9ddafc6f5fab08aba1c5  optim-1.0.16.tar.gz


More information about the scm-commits mailing list