[wannier90] Update to 2.0.0.

[Susi Lehtola]

commit c94598ec8a0d5021ffc2356638bdaa22e1e5d789
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Oct 15 12:35:57 2013 +0300

    Update to 2.0.0.

 .gitignore                      |    1 +
 sources                         |    2 +-
 wannier90-1.1-shlib.patch       |   25 ----------------------
 wannier90-2.0.0-sharedlib.patch |   44 +++++++++++++++++++++++++++++++++++++++
 wannier90.spec                  |   19 ++++++++++------
 5 files changed, 58 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2850d42..e343e2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 wannier90-1.2.tar.gz
+/wannier90-2.0.0.tar.gz
diff --git a/sources b/sources
index 6777fa3..96647eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-764165971f0ee35ff16041320c2cbc29  wannier90-1.2.tar.gz
+c5e120daa414ab6546bdd549675a23e8  wannier90-2.0.0.tar.gz
diff --git a/wannier90-2.0.0-sharedlib.patch b/wannier90-2.0.0-sharedlib.patch
new file mode 100644
index 0000000..d83a32b
--- /dev/null
+++ b/wannier90-2.0.0-sharedlib.patch
@@ -0,0 +1,44 @@
+diff -up wannier90-2.0.0/src/Makefile.2.sharedlib wannier90-2.0.0/src/Makefile.2
+--- wannier90-2.0.0/src/Makefile.2.sharedlib	2013-09-27 12:57:19.000000000 +0300
++++ wannier90-2.0.0/src/Makefile.2	2013-10-15 12:33:52.732150271 +0300
+@@ -8,9 +8,9 @@ OBJS  =  constants.o io.o utility.o para
+ 
+ OBJS2  =  wannier_lib.o
+ 
+-OBJS_POST  = parameters.o kmesh.o io.o comms.o utility.o get_oper.o constants.o postw90_common.o wan_ham.o spin.o dos.o berry.o kpath.o kslice.o boltzwann.o geninterp.o
++OBJS_POST  = comms.o get_oper.o postw90_common.o wan_ham.o spin.o dos.o berry.o kpath.o kslice.o boltzwann.o geninterp.o
+ 
+-LIBRARY = ../../libwannier.a
++LIBRARY = ../../libwannier.so
+ 
+ POSTDIR = ../postw90/
+ 
+@@ -39,15 +39,15 @@ serialobjs: $(OBJS)
+ ../../w90chk2chk.x: $(OBJS) ../w90chk2chk.F90
+ 	$(COMPILER) ../w90chk2chk.F90 $(LDOPTS) $(OBJS) $(LIBS) -o ../../w90chk2chk.x
+ 
+-../../wannier90.x: $(OBJS) ../wannier_prog.F90
+-	$(COMPILER) ../wannier_prog.F90 $(LDOPTS) $(OBJS) $(LIBS) -o ../../wannier90.x
++../../wannier90.x: $(OBJS) ../wannier_prog.F90 $(LIBRARY)
++	$(COMPILER) ../wannier_prog.F90 $(LDOPTS) -L../.. -lwannier -o ../../wannier90.x
+ 
+ post: POSTOPTS = $(TEMP1)
+ post: COMPILER = $(TEMP2)
+ post: mpi_test ../../postw90.x
+ 
+-../../postw90.x: $(OBJS_POST) $(POSTDIR)postw90.F90
+-	$(COMPILER) $(POSTDIR)postw90.F90 $(POSTOPTS) $(LDOPTS) $(OBJS_POST) $(LIBS) -o ../../postw90.x
++../../postw90.x: $(OBJS_POST) $(POSTDIR)postw90.F90 $(LIBRARY)
++	$(COMPILER) $(POSTDIR)postw90.F90 $(POSTOPTS) $(LDOPTS) $(OBJS_POST) -L../.. -lwannier $(LIBS) -o ../../postw90.x
+ 
+ mpi_test :
+ ifeq ($(COMMS),mpi)
+@@ -72,7 +72,7 @@ endif
+ libs:     $(LIBRARY)
+ 
+ $(LIBRARY): $(OBJS) $(OBJS2) 
+-	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS2) $(OBJS)
++	$(F90) $(FCOPTS) -shared -o $(LIBRARY) $(OBJS2) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o *.mod *.MOD *.obj
diff --git a/wannier90.spec b/wannier90.spec
index 02c2a3b..9a0e06d 100644
--- a/wannier90.spec
+++ b/wannier90.spec
@@ -1,13 +1,13 @@
 Name:		wannier90
-Version:	1.2
-Release:	9%{?dist}
+Version:	2.0.0
+Release:	1%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
-URL:		http://wannier.org/
-Source0:	http://quasiamore.mit.edu/wannier/code/wannier90-%{version}.tar.gz
+URL:		http://www.wannier.org/
+Source0:	http://www.wannier.org/code/%{name}-%{version}.tar.gz
 # Patch to enable building of shared library
-Patch0:		wannier90-1.1-shlib.patch
+Patch0:		wannier90-2.0.0-sharedlib.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	gcc-gfortran
@@ -93,7 +93,7 @@ echo "LIBS = -L%{_libdir}/atlas -llapack -lf77blas -latlas" >> make.sys
 # Use reference LAPACK
 #echo "LIBS = -lblas -llapack" >> make.sys
 
-make -C src %{?_smp_mflags} prog
+make -C src %{?_smp_mflags}
 
 # Build documentation
 make -C doc/user_guide
@@ -104,12 +104,13 @@ make -C doc/tutorial
 rm -rf %{buildroot}
 # Binary & library
 install -D -p -m 755 wannier90.x %{buildroot}%{_bindir}/wannier90.x
+install -D -p -m 755 postw90.x   %{buildroot}%{_bindir}/postw90.x
 # Must install as executable so that find-debuginfo catches this
 install -D -p -m 755 libwannier.so %{buildroot}%{_libdir}/libwannier.so
 
 # Fortran module files
 mkdir -p %{buildroot}%{_fmoddir}
-install -p -m 644 src/*.mod %{buildroot}%{_fmoddir}/
+install -p -m 644 src/obj/*.mod %{buildroot}%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot} 
@@ -127,6 +128,7 @@ make test
 %defattr(-,root,root,-)
 %doc CHANGE.log LICENCE README utility/ examples/ 
 %{_bindir}/wannier90.x
+%{_bindir}/postw90.x
 %{_libdir}/libwannier.so
 
 %files devel
@@ -138,6 +140,9 @@ make test
 %doc doc/tutorial.pdf doc/user_guide.pdf
 
 %changelog
+* Tue Oct 15 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0.
+
 * Mon Sep 23 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 1.2-9
 - Rebuild against new ATLAS.