rpms/freefem++/devel .cvsignore, 1.3, 1.4 freefem++.spec, 1.9, 1.10 sources, 1.3, 1.4

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24922

Modified Files:
	.cvsignore freefem++.spec sources 
Log Message:
* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-3.2
- updated to 2.24-2
- fixed build in rawhide
- re-enable testsuite



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Feb 2008 23:25:40 -0000	1.3
+++ .cvsignore	27 Sep 2008 13:12:21 -0000	1.4
@@ -1,2 +1,2 @@
 FreeFem++.1
-freefem++-2.24.tar.gz
+freefem++-2.24-2.tar.gz


Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freefem++.spec	22 Feb 2008 12:33:58 -0000	1.9
+++ freefem++.spec	27 Sep 2008 13:12:21 -0000	1.10
@@ -1,10 +1,13 @@
+%define dotpl .2
+%define dashpl -2
+
 Summary: PDE solving tool
 Name: freefem++
 Version: 2.24
-Release: 2%{?dist}
+Release: 3%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
-Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}.tar.gz
+Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
 Source1: FreeFem++.1
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-gcc43.patch
@@ -14,6 +17,7 @@
 BuildRequires:	atlas-devel
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	environment-modules
 BuildRequires:	fftw-devel
 BuildRequires:	flex
 BuildRequires:	fltk-devel
@@ -60,17 +64,16 @@
 This package contains the MPI version of FreeFem++.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{dashpl}
 %patch0 -p1 -b .r
 %patch1 -p1 -b .gcc43
 chmod -x src/fflib/mt19937ar.cpp
 chmod -x src/lglib/mymain.cpp
 
 %build
+. /etc/profile.d/modules.sh
+module load %{_libdir}/lam/lam.module
 autoreconf
-#sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
-#CPPFLAGS="`pkg-config --cflags lam`"
-#export CPPFLAGS
 %configure \
 	--with-x \
 	--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
@@ -88,8 +91,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%%check
-#%{__make} check
+%check
+. /etc/profile.d/modules.sh
+module load %{_libdir}/lam/lam.module
+%{__make} check
 
 %files
 %defattr(-,root,root,-)
@@ -116,6 +121,11 @@
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-3.2
+- updated to 2.24-2
+- fixed build in rawhide
+- re-enable testsuite
+
 * Fri Feb 22 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-2
 - fix build on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Feb 2008 23:25:40 -0000	1.3
+++ sources	27 Sep 2008 13:12:21 -0000	1.4
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-3acf5bf86d2156d7aa53be86b6413e7c  freefem++-2.24.tar.gz
+1b83214422a4d81717a8ce6e0be7ecca  freefem++-2.24-2.tar.gz