From d83427ca687b1eb49ba2920b656436d1ffde7954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Matos?= <jamatos@fedoraproject.org>
Date: Sun, 14 Feb 2016 18:08:31 +0000
Subject: [PATCH] update to 2.7.8

- modernize python2 and python3 preserving the upgrade path
---
 .gitignore |  1 +
 rpy.spec   | 81 ++++++++++++++++++++++++++++++++----------------------
 sources    |  2 +-
 3 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7ef12e..8648046 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /rpy2-2.6.1.tar.gz
 /rpy2-2.6.2.tar.gz
 /rpy2-2.7.5.tar.gz
+/rpy2-2.7.8.tar.gz
diff --git a/rpy.spec b/rpy.spec
index 535af86..4d8af75 100644
--- a/rpy.spec
+++ b/rpy.spec
@@ -1,22 +1,21 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-# %%global betaver beta1
+%global srcname rpy
+%global sum Python interface to the R language
 %global rver   3.2.3
 
 Name:          rpy
-Summary:       Python interface to the R language
-Version:       2.7.5
-Release:       2%{?dist}
-Url:           http://rpy.sourceforge.net/
-Source:        http://pypi.python.org/packages/source/r/%{name}2/%{name}2-%{version}.tar.gz
+Version:       2.7.8
+Release:       1%{?dist}
+Summary:       %{sum}
+
 License:       GPLv2+
-Group:         Development/Libraries
+Url:           http://rpy.sourceforge.net/
+Source:        http://pypi.python.org/packages/source/r/%{srcname}2/%{srcname}2-%{version}.tar.gz
+
 BuildRequires: R-devel = %{rver}, numpy, python2-devel, python3-devel
 BuildRequires: python-setuptools, python3-setuptools
 BuildRequires: readline-devel
-Requires:      numpy
-Requires:      R-core = %{rver}
 
-Provides:      python-rpy = %{version}-%{release}
+Requires:      python-%{srcname} = %{version}-%{release}
 
 %description
 RPy provides a robust Python interface to the R
@@ -24,45 +23,61 @@ programming language.  It can manage all kinds of R objects and can
 execute arbitrary R functions. All the errors from the R language are
 converted to Python exceptions.
 
-%package -n python3-rpy
-Summary:	Python interface to the R language
 
-%description -n python3-rpy
+%package -n python2-%{srcname}
+Summary:       %{sum}
+#Requires:      python2-numpy
+Requires:      numpy
+Requires:      R-core = %{rver}
+%{?python_provide:%python_provide python2-%{srcname}}
+
+%description -n python2-%{srcname}
 RPy provides a robust Python interface to the R
 programming language.  It can manage all kinds of R objects and can
 execute arbitrary R functions. All the errors from the R language are
 converted to Python exceptions.
 
-%prep
-%setup -q -n %{name}2-%{version}
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+%package -n python3-%{srcname}
+Summary:       %{sum}
+Requires:      python3-numpy
+Requires:      R-core = %{rver}
+%{?python_provide:%python_provide python3-%{srcname}}
+
+%description -n python3-%{srcname}
+RPy provides a robust Python interface to the R
+programming language.  It can manage all kinds of R objects and can
+execute arbitrary R functions. All the errors from the R language are
+converted to Python exceptions.
+
+
+%prep
+%setup -q -n %{srcname}2-%{version}
 
 %build
-env CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
-pushd %{py3dir}
-env CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-popd
+%py2_build
+%py3_build
 
 %install
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
-popd
-%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
+%py2_install
+%py3_install
 
 %files
-%doc AUTHORS NEWS PKG-INFO
-%{python_sitearch}/rpy2/
-%{python_sitearch}/rpy2-%{version}*.egg-info
 
-%files -n python3-rpy
+%files -n python2-%{srcname}
 %doc AUTHORS NEWS PKG-INFO
-%{python3_sitearch}/rpy2/
-%{python3_sitearch}/rpy2-%{version}*.egg-info
+%{python_sitearch}/
+
+%files -n python3-%{srcname}
+%doc AUTHORS NEWS PKG-INFO
+%{python3_sitearch}/
+
 
 %changelog
+* Sun Feb 14 2016 José Matos <jamatos@fedoraproject.org> - 2.7.8-1
+- update to 2.7.8
+- modernize python2 and python3 preserving the upgrade path
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 49c71f9..3c42a0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-459118a2eebdaa362157ae09637b4f77  rpy2-2.7.5.tar.gz
+56ca162bca76bb9c3f935f099c916196  rpy2-2.7.8.tar.gz