[pymilia] New upstream source

[Sergio Pascual]

commit 2bcc9ff3a5f5bad49a61dce3b87918f1cf08a639
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Apr 5 00:33:42 2013 +0200

    New upstream source
    
    - Adding support for python3

 .gitignore   |    1 +
 pymilia.spec |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 62 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95de927..df11acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pymilia-0.3.0.tar.gz
+/pymilia-1.0.0.tar.gz
diff --git a/pymilia.spec b/pymilia.spec
index 1883409..ee3a7c7 100644
--- a/pymilia.spec
+++ b/pymilia.spec
@@ -1,17 +1,21 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 1
+%else
+%{!?python_sitearch: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")}
+%endif
 
 Name: pymilia
-Version: 0.3.0
-Release: 16%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
 Summary: Python wrappers for milia
 License: GPLv3+
 
 Group: Development/Languages
-URL: http://guaix.fis.ucm.es/projects/milia/wiki
-Source0: ftp://astrax.fis.ucm.es/pub/users/spr/milia/%{name}-%{version}.tar.gz
+URL: http://guaix.fis.ucm.es/projects/pymilia/wiki
+Source0: ftp://astrax.fis.ucm.es/pub/software/pymilia/%{name}-%{version}.tar.gz
 
 BuildRequires: python-devel python-setuptools 
-BuildRequires: boost-devel milia-devel >= 0.3.1
+BuildRequires: Cython milia-devel >= 1.0.0
 
 # we don't want to provide private python extension libs
 %{?filter_setup:
@@ -24,23 +28,72 @@ Python wrappers for milia. Milia is a C++ library created to
 compute cosmological distances and ages in the 
 Friedmann-Lemaître-Robertson-Walker metric.
 
+%if 0%{?with_python3}
+%package -n python3-pymilia
+Summary: Python wrappers for milia
+BuildRequires: python3-devel python3-setuptools 
+BuildRequires: python3-Cython milia-devel >= 1.0.0
+
+# we don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python3_sitearch}/.*\.so$
+%filter_setup
+}
+
+%description -n python3-pymilia 
+Python wrappers for milia. Milia is a C++ library created to 
+compute cosmological distances and ages in the 
+Friedmann-Lemaître-Robertson-Walker metric.
+%endif # with_python3
+
 %prep
 %setup -q
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+#find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+#python3-2to3 --no-diffs --write --nobackup %{py3dir}
+%endif # with_python3
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+CFLAGS="%{optflags}" %{__python3} setup.py build
+popd
+%endif # with_python3
+
 %install
 rm -rf %{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root  %{buildroot}
+chmod 755 %{buildroot}%{python3_sitearch}/milia/*.so
+popd
+%endif # with_python3
+
 %{__python} setup.py install --skip-build --root  %{buildroot}
 chmod 755 %{buildroot}%{python_sitearch}/milia/*.so
  
 %files
-%doc COPYING README.txt NEWS.txt
+%doc LICENSE.txt README.txt NEWS.txt
 %{python_sitearch}/milia/
 %{python_sitearch}/*.egg-info
 
+%if 0%{?with_python3}
+%files -n python3-pymilia
+%doc LICENSE.txt README.txt NEWS.txt
+%{python3_sitearch}/milia/
+%{python3_sitearch}/*.egg-info
+%endif # with_python3
+
 %changelog
+* Fri Apr 05 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 1.0.0-1
+- New upstream source
+- Adding support for python3
+
 * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.3.0-16
 - Rebuild for Boost-1.53.0
 
diff --git a/sources b/sources
index 0552e0c..ebaf41a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b9d7aa9e4033ee945b879e9aee0525c  pymilia-0.3.0.tar.gz
+9f16abe54766fcc85e87b9dcca5d3ff2  pymilia-1.0.0.tar.gz