From 76190e2098834bcc41a854188dbae7ab3e7958d3 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 4 Sep 2012 15:24:28 +0200 Subject: [PATCH] Upstream is missing import-package config. This has been reported upstream: http://code.google.com/p/mockito/issues/detail?id=373 Once it's fixed we can eliminate this again. --- fix-bnd-config.patch | 13 +++++++++---- mockito.spec | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch index cec2269..fe41f2f 100644 --- a/fix-bnd-config.patch +++ b/fix-bnd-config.patch @@ -1,5 +1,5 @@ ---- conf/mockito-core.bnd.orig 2012-08-31 17:38:35.605728658 +0200 -+++ conf/mockito-core.bnd 2012-08-31 17:39:06.490980938 +0200 +--- conf/mockito-core.bnd.orig 2012-09-04 15:08:36.953346883 +0200 ++++ conf/mockito-core.bnd 2012-09-04 15:09:49.221919598 +0200 @@ -1,8 +1,3 @@ --classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \ - lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \ @@ -9,7 +9,7 @@ Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis. Bundle-SymbolicName= org.mockito.mockito-core Bundle-Version= 1.9.0 -@@ -10,7 +5,7 @@ +@@ -10,15 +5,16 @@ Export-Package= !org.mockito.asm.*, \ !org.mockito.cglib.*, \ !org.mockito.internal.*, \ @@ -18,7 +18,12 @@ Import-Package= junit.*;resolution:=optional, \ org.junit.*;resolution:=optional, \ -@@ -21,4 +16,4 @@ + org.apache.tools.ant.*;resolution:=optional, \ + org.hamcrest;version="[1.0,2.0)", \ + org.objenesis;version="[1.0,2.0)", \ +- org.mockito.* ++ org.mockito.*, \ ++ net.sf.cglib.proxy Private-Package: org.mockito.* diff --git a/mockito.spec b/mockito.spec index 503e68e..df1b13b 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Java mocking framework License: MIT @@ -86,6 +86,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc NOTICE %changelog +* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 +- Fix missing Import-Package in manifest. + * Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 - Add aqute bnd instructions for OSGi metadata