rpms/octave-forge/devel octave-forge-20090607-fixed-build.patch, NONE, 1.1 octave-forge.spec, 1.82, 1.83

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1713

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-fixed-build.patch 
Log Message:
* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-11
- Fixed shell globbing in build and install sections that missed
  packages with subminor versions (thanks Dmitri Sergatskov)
- Add patch from upstream SVN (r5936) to build fixed-0.7.10 package 
- Renumber patches


octave-forge-20090607-fixed-build.patch:
 Array-f.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE octave-forge-20090607-fixed-build.patch ---
--- main/fixed-0.7.10/src/Array-f.cc	2009/06/11 19:15:58	5935
+++ main/fixed-0.7.10/src/Array-f.cc	2009/06/13 20:39:42	5936
@@ -50,9 +50,9 @@
 				    (arg (a) > arg (b))));
 }
 
-template class OCTAVE_FIXED_API Array<FixedPoint>;
+INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API);
 template class MArray<FixedPoint>;
-template class OCTAVE_FIXED_API Array<FixedPointComplex>;
+INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API);
 template class MArray<FixedPointComplex>;
 
 INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- octave-forge.spec	31 Aug 2009 07:59:54 -0000	1.82
+++ octave-forge.spec	31 Aug 2009 10:15:24 -0000	1.83
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,11 +17,10 @@ URL:            http://octave.sourceforg
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
-#Patch0:         %{name}-image-1.0.8-build.patch
-#Patch0:		octave-forge-20090607-includes.patch
-Patch1:		octave-forge-20090607-ann-swig-build.patch
-Patch2:		octave-forge-20090607-parallel-build.patch
-Patch3:		octave-forge-20090607-java-build.patch
+Patch0:		octave-forge-20090607-ann-swig-build.patch
+Patch1:		octave-forge-20090607-parallel-build.patch
+Patch2:		octave-forge-20090607-java-build.patch
+Patch3:		octave-forge-20090607-fixed-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -170,12 +169,11 @@ do
 done
 
 #apply patches
-#disable patch for the moment, not building 'parallel'
-#patch0 -p0
+%patch0 -p0
 %patch1 -p0
-#disable patch for the moment, not building 'parallel'
-%patch2 -p0
-#patch3 -p0
+#disable patch for the moment, not building 'java'
+#patch2 -p0
+%patch3 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -187,7 +185,7 @@ export TERM=""
 for pkg in main extra language
 do
    cd $pkg
-   for dir in *.[0-9]
+   for dir in *.*[0-9]
    do
       cd $dir
       if [ -f configure ]
@@ -221,7 +219,7 @@ export TERM=""
 for pkg in main extra language
 do
    cd $pkg
-   for dir in *.[0-9]
+   for dir in *.*[0-9]
    do
        cd $dir
        make install TMPDIR=%{_tmppath} DESTDIR=$RPM_BUILD_ROOT DISTPKG=redhat
@@ -249,6 +247,12 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-11
+- Fixed shell globbing in build and install sections that missed
+  packages with subminor versions (thanks Dmitri Sergatskov)
+- Add patch from upstream SVN (r5936) to build fixed-0.7.10 package 
+- Renumber patches
+
 * Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-10
 - Re-enable parallel package, fixed in upstream SVN (diff r5742:6118)
 - Disable include patch, now part of parallel patch