Add patch for Eclipse Luna
This commit is contained in:
parent
5975bbece1
commit
d1b112103d
16
xbean-luna.patch
Normal file
16
xbean-luna.patch
Normal file
@ -0,0 +1,16 @@
|
||||
--- xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java~ 2014-04-14 13:39:32.316688191 +0200
|
||||
+++ xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java 2014-04-14 13:39:41.973106769 +0200
|
||||
@@ -153,5 +153,13 @@
|
||||
public Bundle getBundle(String location) {
|
||||
return bundleContext.getBundle(location);
|
||||
}
|
||||
+
|
||||
+ public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
|
||||
+ return bundleContext.getServiceObjects(reference);
|
||||
+ }
|
||||
+
|
||||
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ?> properties) {
|
||||
+ return bundleContext.registerService(clazz, factory, properties);
|
||||
+ }
|
||||
|
||||
}
|
@ -19,6 +19,8 @@ Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{versi
|
||||
|
||||
# Fix dependency on xbean-asm4-shaded to original objectweb-asm
|
||||
Patch0: %{name}-asm4-unshade.patch
|
||||
# Compatibility with Eclipse Luna (rhbz#1087461)
|
||||
Patch1: %{name}-luna.patch
|
||||
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: apache-commons-beanutils
|
||||
@ -114,6 +116,7 @@ This package provides %{summary}.
|
||||
rm src/site/site.xml
|
||||
|
||||
%patch0
|
||||
%patch1
|
||||
|
||||
%pom_remove_parent
|
||||
%pom_remove_dep mx4j:mx4j
|
||||
@ -196,6 +199,7 @@ find -name pom.xml -exec sed -i "s|<artifactId>cglib-nodep</artifactId>|<artifac
|
||||
%changelog
|
||||
* Mon Apr 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.17-1
|
||||
- Update to upstream version 3.17
|
||||
- Add patch for Eclipse Luna
|
||||
|
||||
* Thu Dec 5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.16-1
|
||||
- Update to upstream version 3.16
|
||||
|
Loading…
Reference in New Issue
Block a user