rpms/wannier90/devel wannier90.spec,1.4,1.5

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/wannier90/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/devel

Modified Files:
	wannier90.spec 
Log Message:
Fix location of Fortran modules. Use ATLAS instead of LAPACK. Fix test phase.


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/wannier90.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wannier90.spec	27 Jul 2009 07:02:37 -0000	1.4
+++ wannier90.spec	16 Sep 2009 17:24:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -11,12 +11,17 @@ Patch0:		wannier90-1.1-shlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
-BuildRequires:	lapack-devel
-# On Fedora this is pulled in by lapack-devel, but EPEL needs this
-BuildRequires:	blas-devel
 # For test phase
 BuildRequires:	perl(Cwd)
 
+# Linear algebra: use ATLAS
+BuildRequires:	atlas-devel
+
+# Reference LAPACK
+#BuildRequires:	lapack-devel
+# On Fedora this is pulled in by lapack-devel, but EPEL needs this
+#BuildRequires:	blas-devel
+
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
 (MLWF) from a set of Bloch energy bands that may or may not be attached to or
@@ -58,7 +63,11 @@ chmod 644 utility/kmesh.pl
 echo "F90 = gfortran" > make.sys
 echo "FCOPTS = %{optflags} -fPIC" >> make.sys
 echo "LDOPTS = %{optflags} -fPIC" >> make.sys
-echo "LIBS = -lblas -llapack" >> make.sys
+
+# Use ATLAS
+echo "LIBS = -L%{_libdir}/atlas -lf77blas -latlas -llapack" >> make.sys
+# Use reference LAPACK
+#echo "LIBS = -lblas -llapack" >> make.sys
 
 make -C src %{?_smp_mflags} prog
 
@@ -70,14 +79,15 @@ install -D -p -m 755 wannier90.x %{build
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -p -m 644 src/*.mod %{buildroot}%{_includedir}/%{name}/
-
+mkdir -p %{buildroot}%{_fmoddir}
+install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
 
 %check
+# Set path so that wannier finds its library
+export LD_LIBRARY_PATH=`pwd`
 make test
 
 %post -p /sbin/ldconfig
@@ -92,22 +102,27 @@ make test
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%{_fmoddir}/w90_*.mod
 
 
 %changelog
+* Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
+- Fix location of Fortran modules.
+- Fix check phase.
+- Use ATLAS instead of reference BLAS & LAPACK.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-4
+* Sat May 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-4
 - Fix EPEL build by adding explicit BR: blas-devel.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-3
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
 - Link binary against shared library.
 - Put library back into main package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-2
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
 - Break libs into own package.
 
-* Tue Apr 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.1-1
+* Tue Apr 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - First release.