- up to 1.10r1

- ac/am, use system libffi

Changed files:
    FreeMat.spec -> 1.7

diff --git a/FreeMat.spec b/FreeMat.spec
index 40716cf2facde3fd8b771c8ec9ebb7a72579370f..fb9e855a2d76d03d124361a7d699975fa3e0b7bc 100644 (file)
--- a/FreeMat.spec
+++ b/FreeMat.spec
@@ -1,21 +1,26 @@
 # TODO:
 # - look at MPI support - doesn't work with lam for me :/
 # - use system libffi
 # TODO:
 # - look at MPI support - doesn't work with lam for me :/
 # - use system libffi

+%define                fversion        %(echo %{version} |tr r -)
+%define                mversion        %(echo %{version} |cut -f -1 -d r)

 Summary:       FreeMat - an environment for rapid engineering and scientific processing
 Summary(pl):   FreeMat - ¶rodowisko do szybkiego przetwarzania in¿ynieryjnego i naukowego
 Name:          FreeMat
 Summary:       FreeMat - an environment for rapid engineering and scientific processing
 Summary(pl):   FreeMat - ¶rodowisko do szybkiego przetwarzania in¿ynieryjnego i naukowego
 Name:          FreeMat

-Version:       1.09
-Release:       2
+Version:       1.10r1
+Release:       1

 License:       MIT
 Group:         Applications/Math
 License:       MIT
 Group:         Applications/Math

-Source0:       http://dl.sourceforge.net/freemat/%{name}-%{version}.tar.gz
-# Source0-md5: 87b9615d9071ccc3073fd3fe5d31bd6e
+Source0:       http://dl.sourceforge.net/freemat/%{name}-%{fversion}.tar.gz
+# Source0-md5: 46c02f2c8c882c7d6f968d21c5a62b27

 Source1:       %{name}.desktop
 Source1:       %{name}.desktop

+Patch0:                %{name}-system_ffi.patch

 URL:           http://freemat.sourceforge.net
 URL:           http://freemat.sourceforge.net

+BuildRequires: autoconf

 BuildRequires: automake
 BuildRequires: blas-devel
 BuildRequires: fltk-devel
 BuildRequires: gcc-g77
 BuildRequires: automake
 BuildRequires: blas-devel
 BuildRequires: fltk-devel
 BuildRequires: gcc-g77

+BuildRequires: libffi-devel

 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel


@@ -43,12 +48,15 @@ r
 rysowaniem i wy¶wietlaniem mo¿liwo¶ci.
 
 %prep
 rysowaniem i wy¶wietlaniem mo¿liwo¶ci.
 
 %prep

-%setup -q
+%setup -q -n %{name}-%{mversion}
+%patch0

 
 %build
 
 %build

-cp -f %{_datadir}/automake/config.sub .

 CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
 CXXFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
 CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
 CXXFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"

+%{__aclocal}
+%{__autoconf}
+%{__automake}

 %configure \
        --with-ncurses
 
 %configure \
        --with-ncurses