rpms/wannier90/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wannier90.spec, 1.5, 1.6

[Jussi Lehtola]

Author: jussilehtola

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

Modified Files:
	.cvsignore sources wannier90.spec 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 May 2009 07:48:41 -0000	1.2
+++ .cvsignore	27 Jan 2010 12:04:26 -0000	1.3
@@ -1 +1 @@
-wannier90-1.1.tar.gz
+wannier90-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 May 2009 07:48:42 -0000	1.2
+++ sources	27 Jan 2010 12:04:27 -0000	1.3
@@ -1 +1 @@
-2a547276e25d2345480ec3717c6c2f3f  wannier90-1.1.tar.gz
+764165971f0ee35ff16041320c2cbc29  wannier90-1.2.tar.gz


Index: wannier90.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wannier90/devel/wannier90.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- wannier90.spec	16 Sep 2009 17:24:23 -0000	1.5
+++ wannier90.spec	27 Jan 2010 12:04:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wannier90
-Version:	1.1
-Release:	6%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 Summary:	Maximally-localised Wannier functions 
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -17,10 +17,8 @@ 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
+# For documentation
+BuildRequires:	tex(latex)
 
 %description
 Wannier90 is a program for calculating maximally-localised Wannier functions
@@ -51,12 +49,28 @@ Requires:	%{name} = %{version}-%{release
 %description devel
 This package contains Fortran modules for Wannier90.
 
+%package doc
+Summary:	Documentation for Wannier90
+Group:		Documentation
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+BuildArch:	noarch
+%endif
+
+%description doc
+This package contains the tutorial and user's guide for Wannier90.
+
+
 %prep
 %setup -q
-%patch0 -p1
-
+%patch0 -p1 -b .sharedlib
 # Remove executable flag from utility that is included in doc
 chmod 644 utility/kmesh.pl
+# Convert documentation
+for file in CHANGE.log; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
 
 %build
 # Generate make.sys
@@ -71,6 +85,11 @@ echo "LIBS = -L%{_libdir}/atlas -lf77bla
 
 make -C src %{?_smp_mflags} prog
 
+# Build documentation
+make -C doc/user_guide
+make -C doc/tutorial
+
+
 %install
 rm -rf %{buildroot}
 # Binary & library
@@ -96,7 +115,7 @@ make test
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGE.log LICENCE README utility/ doc/*.pdf examples/ 
+%doc CHANGE.log LICENCE README utility/ examples/ 
 %{_bindir}/wannier90.x
 %{_libdir}/libwannier.so
 
@@ -104,8 +123,14 @@ make test
 %defattr(-,root,root,-)
 %{_fmoddir}/w90_*.mod
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/tutorial.pdf doc/user_guide.pdf
 
 %changelog
+* Wed Jan 27 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2-1
+- Update to 1.2.
+
 * Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-6
 - Fix location of Fortran modules.
 - Fix check phase.