From 5689c0cc3a65322c0d70c0c5a88bb33611087672 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 27 Oct 2017 20:06:31 -0400 Subject: [PATCH] 2.9.0 --- .gitignore | 1 + rpy.spec | 30 +++++++++++++++++++++++------- sources | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ec30675..d74ed7f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /rpy2-2.8.3.tar.gz /rpy2-2.8.5.tar.gz /rpy2-2.8.6.tar.gz +/rpy2-2.9.0.tar.gz diff --git a/rpy.spec b/rpy.spec index 260e8b4..c8ed704 100644 --- a/rpy.spec +++ b/rpy.spec @@ -1,21 +1,26 @@ %global srcname rpy %global sum Python interface to the R language -%global rver 3.4.1 +%global rver 3.4.2 +%global python2 0 + Name: rpy -Version: 2.8.6 -Release: 3%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: %{sum} License: GPLv2+ Url: https://pypi.python.org/pypi/rpy2 Source: https://files.pythonhosted.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: R-devel = %{rver}, numpy +%if %{python2} +BuildRequires: python-setuptools, python2-devel +%endif +BuildRequires: python3-setuptools, python3-devel BuildRequires: readline-devel -Requires: python-%{srcname} = %{version}-%{release} +Requires: python3-%{srcname} = %{version}-%{release} %description RPy provides a robust Python interface to the R @@ -23,7 +28,7 @@ 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. - +%if %{python2} %package -n python2-%{srcname} Summary: %{sum} #Requires: python2-numpy @@ -36,6 +41,7 @@ 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. +%endif %package -n python3-%{srcname} @@ -60,18 +66,24 @@ converted to Python exceptions. # Temporary workaround to fix a bug in R # see https://stat.ethz.ch/pipermail/r-devel/2016-December/073548.html +%if %{python2} CFLAGS="$RPM_OPT_FLAGS -DHAVE_UINTPTR_T=1" %{__python2} setup.py build +%endif CFLAGS="$RPM_OPT_FLAGS -DHAVE_UINTPTR_T=1" %{__python3} setup.py build %install +%if %{python2} %py2_install +%endif %py3_install %files +%if %{python2} %files -n python2-%{srcname} %doc AUTHORS NEWS PKG-INFO %{python_sitearch}/ +%endif %files -n python3-%{srcname} %doc AUTHORS NEWS PKG-INFO @@ -79,6 +91,10 @@ CFLAGS="$RPM_OPT_FLAGS -DHAVE_UINTPTR_T=1" %{__python3} setup.py build %changelog +* Fri Oct 27 2017 Tom Callaway - 2.9.0-1 +- update to 2.9.0, rebuild for R 3.4.2 +- disable python2 support + * Thu Aug 03 2017 Fedora Release Engineering - 2.8.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 598547c..d4d60ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpy2-2.8.6.tar.gz) = 614fd404c2bcd51a503e05bd2ea51fe39ddf20b16088496e9d9f0017ccbd06707f26341243c33669ae4ddf5b37ed748546cab9d4d23b9c26fd39319d9831dcfe +SHA512 (rpy2-2.9.0.tar.gz) = 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2