diff --git a/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch new file mode 100644 index 0000000..3b4e749 --- /dev/null +++ b/sisu-OSGi-import-guava.patch @@ -0,0 +1,10 @@ +--- sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF~ 2014-04-21 16:32:25.000000000 +0200 ++++ sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF 2014-04-23 10:53:22.538142253 +0200 +@@ -16,6 +16,7 @@ + com.google.inject.matcher;version="1.3", + com.google.inject.name;version="1.3", + com.google.inject.spi;version="1.3", ++ com.google.common.base, + org.osgi.framework;version="1.5", + org.osgi.util.tracker;version="1.4", + org.slf4j;resolution:=optional, diff --git a/sisu.spec b/sisu.spec index e6c50f0..465b683 100644 --- a/sisu.spec +++ b/sisu.spec @@ -1,7 +1,7 @@ Name: sisu Epoch: 1 Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eclipse dependency injection framework # bundled asm is under BSD # See also: https://fedorahosted.org/fpc/ticket/346 @@ -13,6 +13,8 @@ URL: http://eclipse.org/sisu Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.inject-%{version}.tar.bz2 Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}.tar.bz2 +Patch0: %{name}-OSGi-import-guava.patch + BuildArch: noarch # FIXME: sisu fails to build under Java 8 @@ -115,6 +117,8 @@ This package contains %{summary}. tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases +%patch0 + %mvn_file ":{*}" @1 %mvn_package ":*{inject,plexus}" @1 %mvn_package : __noinstall @@ -197,6 +201,9 @@ done %changelog +* Wed Apr 23 2014 Mikolaj Izdebski - 1:0.2.1-2 +- Import guava in OSGi manifest + * Tue Apr 22 2014 Mikolaj Izdebski - 1:0.2.1-1 - Update to upstream version 0.2.1 - Remove patch for Eclipse bug 429369