[PyQuante/f13/master] Update to newest svn snapshot. Compile against libint. Run tests.

[Jussi Lehtola]

commit c7f1c65e20f38351d757b14357a0286a59c669a5
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed Nov 3 21:25:30 2010 +0200

    Update to newest svn snapshot. Compile against libint. Run tests.

 PyQuante-libint.patch |   31 +++++++++++++++++++++++++++++++
 PyQuante.spec         |   40 ++++++++++++++++++++++++++++++++--------
 sources               |    2 +-
 3 files changed, 64 insertions(+), 9 deletions(-)
---
diff --git a/PyQuante-libint.patch b/PyQuante-libint.patch
new file mode 100644
index 0000000..24f4dad
--- /dev/null
+++ b/PyQuante-libint.patch
@@ -0,0 +1,31 @@
+diff -up pyquante/setup.py.sharedlib pyquante/setup.py
+--- pyquante/setup.py.sharedlib	2010-11-03 20:41:09.000000000 +0200
++++ pyquante/setup.py	2010-11-03 20:53:02.178918470 +0200
+@@ -82,16 +82,7 @@ else:
+ 
+ if enable_libint:
+     # Libint Extension compilation stuff
+-    libint_static = [] # Libint object files
+-    for part in ["libint","libderiv","libr12"]:
+-        libint_static += glob.glob("libint-1.1.4/src/lib/%s/tmp/%s/.libs/*.o"%(part,part))
+-        
+-    # Error checking
+-    if libint_static == []:
+-        raise Exception("Object files not found, have you compiled libint with configure --enable-shared ?")
+-    
+-    # Preparing the extension
+-    libint_includes = ["libint-1.1.4/include/libint"] # Libint include dir
++    libint_includes = ["/usr/include/libint"] # Libint include dir
+     
+     lib_clibint =["Src/lib/clibint.c"] + lib_shell      # Thin libint wrapper (actually one function, shell_compute)
+     clibint_ext_src = ["Src/PyQuante/clibint.c"] + lib_clibint # Need to add libint_static when linking
+@@ -99,8 +90,7 @@ if enable_libint:
+     clibint_ext = Extension("PyQuante.clibint",
+                             clibint_ext_src,
+                             include_dirs = lib_includes + libint_includes ,
+-                            libraries = ["stdc++"],
+-                            extra_objects = libint_static)
++                            libraries = ["stdc++","int"])
+     ext_modules.append(clibint_ext)
+ 
+ 
diff --git a/PyQuante.spec b/PyQuante.spec
index c884166..fca12dc 100644
--- a/PyQuante.spec
+++ b/PyQuante.spec
@@ -1,18 +1,24 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%global svnrel 174svn
+
 Name:		PyQuante
 Version:	1.6.3
-Release:	3%{?dist}
+Release:	5.%{svnrel}%{?dist}
 Summary:	Python Quantum Chemistry
 Group:		Applications/Engineering
 License:	BSD
 URL:		http://pyquante.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz
+Source0:	%{name}-%{svnrel}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		PyQuante-libint.patch
+
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
 BuildRequires:	numpy
+BuildRequires:	libint-devel
 Requires:	numpy
 
 %description
@@ -27,28 +33,46 @@ can construct their own quantum chemistry programs without going through the
 tedium of having to write every low-level routine.
 
 %prep
-%setup -q
+#setup -q
+%setup -q -n pyquante 
+%patch0 -p1 -b .sharedlib
 
 %build
-%{__python} -c 'import setuptools; execfile("setup.py")' build
+python -c 'import setuptools; execfile("setup.py")' build --enable-libint
 
 %install
 rm -rf %{buildroot}
-%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
+python -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 mkdir -p %{buildroot}/%{_datadir}/%{name}
 cp -a Tests %{buildroot}/%{_datadir}/%{name}/
 
-
 %clean
 rm -rf %{buildroot}
 
+%check
+# Run tests
+libdir=`ls build/|grep lib`
+export PYTHONPATH=`pwd`/build/$libdir
+
+cd Tests
+./runalltests.py 
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README Doc/*
-%{python_sitearch}/*
-%{_datadir}/%{name}
+%{python_sitearch}/%{name}/
+%{python_sitearch}/%{name}-%{version}-py*.egg-info
+%{_datadir}/%{name}/
 
 %changelog
+* Wed Nov 03 2010 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.6.3-5.174svn
+- Switch to using an SVN snapshot.
+- Build against libint.
+- Run tests.
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.6.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Thu Dec 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.6.3-3
 - Fix FTBFS on Fedora 13.
 
diff --git a/sources b/sources
index ce1db03..30524cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e44d1e67a4f62da69ade7e26e53ab7b  PyQuante-1.6.3.tar.gz
+1f1083a8c2c40fb865a1cc344a3d193f  PyQuante-174svn.tar.bz2