From 00c2c26bd2dddaef679853fefb4eb19fb24efdb1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jun 01 2016 07:33:33 +0000
Subject: Fix OSGi manifest


- Resolves: rhbz#1341052

---

diff --git a/0001-Port-to-maven-jar-plugin-3.0.0.patch b/0001-Port-to-maven-jar-plugin-3.0.0.patch
index b566044..a5a882d 100644
--- a/0001-Port-to-maven-jar-plugin-3.0.0.patch
+++ b/0001-Port-to-maven-jar-plugin-3.0.0.patch
@@ -1,7 +1,7 @@
-From 4291ccd3927865d7da94f8e9408cb24d898ba22e Mon Sep 17 00:00:00 2001
+From c68c40a586dc187e5f004a0279f143b278b81cd6 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 30 May 2016 10:45:16 +0200
-Subject: [PATCH 1/3] Port to maven-jar-plugin 3.0.0
+Subject: [PATCH 1/4] Port to maven-jar-plugin 3.0.0
 
 ---
  pom.xml | 2 +-
diff --git a/0002-Disable-android-support.patch b/0002-Disable-android-support.patch
index 583e9f0..e4b65d3 100644
--- a/0002-Disable-android-support.patch
+++ b/0002-Disable-android-support.patch
@@ -1,7 +1,7 @@
-From f8a748f63a7d54ecaccabf88205968c87b55332c Mon Sep 17 00:00:00 2001
+From 1422eddacbbe4ca5614794ebb7ba8779ce2718f2 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 30 May 2016 14:24:43 +0200
-Subject: [PATCH 2/3] Disable android support
+Subject: [PATCH 2/4] Disable android support
 
 ---
  core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------
diff --git a/0003-Unshade-cglib-and-asm.patch b/0003-Unshade-cglib-and-asm.patch
index c686162..2ae8c91 100644
--- a/0003-Unshade-cglib-and-asm.patch
+++ b/0003-Unshade-cglib-and-asm.patch
@@ -1,7 +1,7 @@
-From 16f8ae1d94ec088841f06506ec260695d8b97703 Mon Sep 17 00:00:00 2001
+From 1f0a742506d9d6270607158d91f9939089a1b731 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 30 May 2016 15:14:40 +0200
-Subject: [PATCH 3/3] Unshade cglib and asm
+Subject: [PATCH 3/4] Unshade cglib and asm
 
 ---
  core/pom.xml | 4 ++--
diff --git a/0004-Fix-OSGi-manifest.patch b/0004-Fix-OSGi-manifest.patch
new file mode 100644
index 0000000..7c0b04c
--- /dev/null
+++ b/0004-Fix-OSGi-manifest.patch
@@ -0,0 +1,28 @@
+From a228c98f921520577d9563b0a330f7af4f19b66c Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 1 Jun 2016 09:31:44 +0200
+Subject: [PATCH 4/4] Fix OSGi manifest
+
+Resolves: rhbz#1341052
+---
+ core/pom.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/pom.xml b/core/pom.xml
+index 2fa5653..73c4d94 100644
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -87,8 +87,9 @@
+         <artifactId>maven-bundle-plugin</artifactId>
+         <configuration>
+           <instructions>
+-            <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
++            <Export-Package>org.easymock,org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
+             <Import-Package>org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional</Import-Package>
++	    <_nouses>true</_nouses>
+           </instructions>
+         </configuration>
+         <executions>
+-- 
+2.5.5
+
diff --git a/easymock.spec b/easymock.spec
index a6856ce..7a48fed 100644
--- a/easymock.spec
+++ b/easymock.spec
@@ -1,6 +1,6 @@
 Name:           easymock
 Version:        3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy mock objects
 License:        ASL 2.0
 URL:            http://www.easymock.org
@@ -10,6 +10,7 @@ Source0:        https://github.com/%{name}/%{name}/archive/%{name}-%{version}.ta
 Patch1:         0001-Port-to-maven-jar-plugin-3.0.0.patch
 Patch2:         0002-Disable-android-support.patch
 Patch3:         0003-Unshade-cglib-and-asm.patch
+Patch4:         0004-Fix-OSGi-manifest.patch
 
 BuildArch:      noarch
 
@@ -22,7 +23,7 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.objenesis:objenesis)
 
-Obsoletes:      %{name}3 < %{version}-%{release}
+Obsoletes:      %{name}3 < 3.4
 Provides:       %{name}3 = %{version}-%{release}
 Obsoletes:      %{name}2 < 2.5.2-10
 
@@ -47,6 +48,7 @@ Javadoc for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # remove android support
 rm core/src/main/java/org/easymock/internal/Android*.java
@@ -89,6 +91,10 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 
 
 %changelog
+* Wed Jun  1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-2
+- Fix OSGi manifest
+- Resolves: rhbz#1341052
+
 * Mon May 30 2016 Michael Simacek <msimacek@redhat.com> - 3.4-1
 - Update to upstream version 3.4