[sisu] Update to upstream version 0.3.0
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Feb 25 13:50:14 UTC 2015
commit c1fc5d9a5998f14118375276b3ea737ade81cf98
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Feb 23 11:41:02 2015 +0100
Update to upstream version 0.3.0
.gitignore | 2 ++
sisu-OSGi-import-guava.patch | 10 ++++++++++
sisu-java8.patch | 38 --------------------------------------
sisu.spec | 11 ++++++-----
sources | 4 ++--
5 files changed, 20 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd7e4bd..0186fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
+/org.eclipse.sisu.inject-0.3.0.tar.bz2
+/org.eclipse.sisu.plexus-0.3.0.tar.bz2
diff --git a/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch
index 3b4e749..8ab5759 100644
--- a/sisu-OSGi-import-guava.patch
+++ b/sisu-OSGi-import-guava.patch
@@ -8,3 +8,13 @@
org.osgi.framework;version="1.5",
org.osgi.util.tracker;version="1.4",
org.slf4j;resolution:=optional,
+--- sisu-inject/org.eclipse.sisu.inject/build.properties~ 2015-02-25 14:46:42.392037463 +0100
++++ sisu-inject/org.eclipse.sisu.inject/build.properties 2015-02-25 14:44:56.626803789 +0100
+@@ -17,5 +17,5 @@
+ .
+
+ # build with JSR250 v1.2 and workaround indirect Guava dependency via Guice 4
+-extra.. = platform:/plugin/javax.annotation,platform:/plugin/com.google.guava
+-additional.bundles = javax.annotation,com.google.guava
++extra.. = platform:/plugin/javax.annotation-api,platform:/plugin/com.google.guava
++additional.bundles = javax.annotation-api,com.google.guava
diff --git a/sisu.spec b/sisu.spec
index 665108e..b90622b 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,11 +1,11 @@
# Release type, either "milestone" or "release"
-%global reltype milestone
-%global reltag .M1
+%global reltype release
+#global reltag .M1
Name: sisu
Epoch: 1
Version: 0.3.0
-Release: 0.2%{?reltag}%{?dist}
+Release: 1%{?dist}
Summary: Eclipse dependency injection framework
License: EPL
URL: http://eclipse.org/sisu
@@ -14,7 +14,6 @@ Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.bz2
Patch0: %{name}-OSGi-import-guava.patch
-Patch1: %{name}-java8.patch
Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-plexus-utils-3.0.18.patch
@@ -119,7 +118,6 @@ tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
-%patch1
%patch2
%patch3
@@ -208,6 +206,9 @@ EOF
%changelog
+* Mon Feb 23 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:0.3.0-1
+- Update to upstream version 0.3.0
+
* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:0.3.0-0.2.M1
- Unbundle ASM
- Resolves: rhbz#1085903
diff --git a/sources b/sources
index 8794505..5fea523 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7c8e0b75878b71e5b77e2a8e1b35ffa8 org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
-4afe3fb24ff0d93066b670e288c365b3 org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
+ed53df7106aac1e8746301f65de3691b org.eclipse.sisu.inject-0.3.0.tar.bz2
+6ec9b89577a98add2b9a58c5e35acf5d org.eclipse.sisu.plexus-0.3.0.tar.bz2
More information about the scm-commits
mailing list