rpms/wannier90/devel wannier90-1.1-shlib.patch, 1.1, 1.2 wannier90.spec, 1.6, 1.7

[Jussi Lehtola]

Author: jussilehtola

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

Modified Files:
	wannier90-1.1-shlib.patch wannier90.spec 
Log Message:
Link library against ATLAS.

wannier90-1.1-shlib.patch:
 Makefile |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Index: wannier90-1.1-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/wannier90-1.1-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wannier90-1.1-shlib.patch	16 May 2009 07:48:42 -0000	1.1
+++ wannier90-1.1-shlib.patch	16 Feb 2010 11:16:17 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up wannier90-1.1/src/Makefile.orig wannier90-1.1/src/Makefile
---- wannier90-1.1/src/Makefile.orig	2007-08-22 19:22:27.000000000 +0300
-+++ wannier90-1.1/src/Makefile	2009-05-15 15:36:00.000000000 +0300
+diff -up wannier90-1.2/src/Makefile.sharedlib wannier90-1.2/src/Makefile
+--- wannier90-1.2/src/Makefile.sharedlib	2009-10-29 12:20:04.000000000 +0200
++++ wannier90-1.2/src/Makefile	2010-02-16 12:29:08.438336863 +0200
 @@ -8,16 +8,15 @@ OBJS  =  constants.o io.o utility.o para
  
  OBJS2  =  wannier_lib.o
@@ -19,7 +19,7 @@ diff -up wannier90-1.1/src/Makefile.orig
 -	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS2) $(OBJS)
 -
 +$(LIBRARY): $(OBJS) $(OBJS2)
-+	$(F90) $(FCOPTS) -shared -o $(LIBRARY) $(OBJS2) $(OBJS)
++	$(F90) $(FCOPTS) -shared -o $(LIBRARY) $(OBJS2) $(OBJS) $(LIBS)
  
  
  clean:


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/wannier90.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- wannier90.spec	27 Jan 2010 12:04:27 -0000	1.6
+++ wannier90.spec	16 Feb 2010 11:16:17 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		wannier90
 Version:	1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -128,6 +128,9 @@ make test
 %doc doc/tutorial.pdf doc/user_guide.pdf
 
 %changelog
+* Tue Feb 16 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2-2
+- Link library correctly against ATLAS.
+
 * Wed Jan 27 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2-1
 - Update to 1.2.