From 3263df0af149739db469cad34d1d5e92fc761a3d Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Jun 19 2015 14:43:31 +0000
Subject: merge


---

diff --git a/.gitignore b/.gitignore
index d07bb0c..41eb5b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /rpy2-2.5.6.tar.gz
+/rpy2-2.6.0.tar.gz
diff --git a/rpy.spec b/rpy.spec
index fc5af9f..272e41b 100644
--- a/rpy.spec
+++ b/rpy.spec
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # %%global betaver beta1
-%global rver   3.2.0
+%global rver   3.2.1
 
 Name:          rpy
 Summary:       Python interface to the R language
-Version:       2.5.6
-Release:       4%{?dist}
+Version:       2.6.0
+Release:       1%{?dist}
 Url:           http://rpy.sourceforge.net/
 Source:        http://pypi.python.org/packages/source/r/%{name}2/%{name}2-%{version}.tar.gz
 License:       GPLv2+
@@ -63,6 +63,12 @@ popd
 %{python3_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Fri Jun 19 2015 Tom Callaway <spot@fedoraproject.org> - 2.6.0-1
+- 2.6.0, R 3.2.1
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Thu Apr 30 2015 Tom Callaway <spot@fedoraproject.org> - 2.5.6-4
 - R 3.2.0
 
diff --git a/sources b/sources
index 9a5c399..158e085 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a36e758b633ce6aec6a5f450bfee980f  rpy2-2.5.6.tar.gz
+679898fbc832d4f05a5efcf1a7eb1a68  rpy2-2.6.0.tar.gz