From 027912d88e0459ad8683cd01a33210c65761e3f4 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil@redhat.com>
Date: Aug 26 2015 11:54:39 +0000
Subject: Remove upstreamed patches


---

diff --git a/Fix-build-with-latest-R-version-3.2.patch b/Fix-build-with-latest-R-version-3.2.patch
deleted file mode 100644
index 82e8824..0000000
--- a/Fix-build-with-latest-R-version-3.2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 88b14d85b9504af29fa34ac41109db6ff1d8bdf5 Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck <tittiatcoke@gmail.com>
-Date: Mon, 25 May 2015 15:19:20 +0200
-Subject: [PATCH 1/3] Fix build with latest R (version 3.2)
-
-REVIEW: 123531
----
- src/backends/R/rserver/rcallbacks.cpp | 1 +
- src/backends/R/rserver/rcallbacks.h   | 1 -
- src/backends/R/rserver/rserver.cpp    | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp
-index 2c86531..492f270 100644
---- a/src/backends/R/rserver/rcallbacks.cpp
-+++ b/src/backends/R/rserver/rcallbacks.cpp
-@@ -26,6 +26,7 @@
- #include <QStringList>
- 
- #include <stdio.h>
-+#include <Rinterface.h>
- 
- RServer* server;
- Expression* currentExpression;
-diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h
-index 8f4752c..6d0e9a2 100644
---- a/src/backends/R/rserver/rcallbacks.h
-+++ b/src/backends/R/rserver/rcallbacks.h
-@@ -30,7 +30,6 @@ class Expression;
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
- 
- //This File implements the necessary callbacks for R
-diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
-index 30cdb70..f689f42 100644
---- a/src/backends/R/rserver/rserver.cpp
-+++ b/src/backends/R/rserver/rserver.cpp
-@@ -42,7 +42,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
- 
- // Not making a member to prevent pulling R headers into rserver.h
--- 
-2.4.1
-
diff --git a/cantor.spec b/cantor.spec
index cd9a027..6e71e20 100644
--- a/cantor.spec
+++ b/cantor.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:    cantor
-Summary: KDE Frontend to Mathematical Software 
+Summary: KDE Frontend to Mathematical Software
 Version: 15.08.0
 Release: 1%{?dist}
 
@@ -18,8 +18,6 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/cantor
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstream patches
-# master branch
-Patch1: Fix-build-with-latest-R-version-3.2.patch
 
 BuildRequires: analitza-devel >= 14.12
 BuildRequires: desktop-file-utils
@@ -72,8 +70,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
-%patch1 -p1 -b .fix_build_with_R_32
-
 
 %build
 mkdir %{_target_platform}