From 21cc7a5a19d5111535e472fe10974805fa1a7325 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 7 Jan 2016 11:37:38 +0100
Subject: [PATCH] Remove unneeded patch

---
 sisu-plexus-utils-3.0.18.patch | 27 ---------------------------
 sisu.spec                      |  7 ++++---
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 sisu-plexus-utils-3.0.18.patch

diff --git a/sisu-plexus-utils-3.0.18.patch b/sisu-plexus-utils-3.0.18.patch
deleted file mode 100644
index 5fe8021..0000000
--- a/sisu-plexus-utils-3.0.18.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
-+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
-@@ -88,7 +88,7 @@ public final class PlexusAnnotatedMetadata
-             return text;
-         }
-         // use same interpolation method as XML for sake of consistency
--        final Reader r = new InterpolationFilterReader( new StringReader( text ), variables );
-+        final Reader r = new InterpolationFilterReader( new StringReader( text ), (Map) variables );
-         try
-         {
-             return IOUtil.toString( r );
-diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
-index e04fb07..d715460 100644
---- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
-+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
-@@ -113,7 +113,7 @@ final class PlexusXmlScanner
-         final Reader reader = ReaderFactory.newXmlReader( in );
-         if ( null != variables )
-         {
--            return new InterpolationFilterReader( reader, variables );
-+            return new InterpolationFilterReader( reader, (Map) variables );
-         }
-         return reader;
-     }
--- 
-1.9.3
-
diff --git a/sisu.spec b/sisu.spec
index 2f39048..ba9e831 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -5,7 +5,7 @@
 Name:           sisu
 Epoch:          1
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse dependency injection framework
 License:        EPL
 URL:            http://eclipse.org/sisu
@@ -15,7 +15,6 @@ Source1:        http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/
 
 Patch0:         %{name}-OSGi-import-guava.patch
 Patch2:         %{name}-ignored-tests.patch
-Patch3:         %{name}-plexus-utils-3.0.18.patch
 
 BuildArch:      noarch
 
@@ -125,7 +124,6 @@ tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
 
 %patch0
 %patch2
-%patch3
 
 # Unbundle ASM
 rm -rf sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/
@@ -213,6 +211,9 @@ EOF
 
 
 %changelog
+* Thu Jan  7 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-2
+- Remove unneeded patch
+
 * Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-1
 - Update to upstream version 0.3.2