[felix-osgi-obr-resolver/f17] Initial import
Marek Goldmann
goldmann at fedoraproject.org
Mon Jun 18 13:13:44 UTC 2012
commit 301066da90fcec220af9b70fd3d48f8191a93e23
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Mon Jun 18 15:13:26 2012 +0200
Initial import
.gitignore | 1 +
0001-Use-felix-directly.patch | 29 +++++++++++++
0002-JDK7-support.patch | 49 +++++++++++++++++++++
felix-osgi-obr-resolver.spec | 93 +++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 173 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..482bd03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz
diff --git a/0001-Use-felix-directly.patch b/0001-Use-felix-directly.patch
new file mode 100644
index 0000000..7aaaa65
--- /dev/null
+++ b/0001-Use-felix-directly.patch
@@ -0,0 +1,29 @@
+From 0996b3e0447e81e445b8d9e486f2eae58966f3b2 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Thu, 14 Jun 2012 11:15:05 +0200
+Subject: [PATCH 1/2] Use felix directly
+
+---
+ pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 3fb1672..2b1db18 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -33,9 +33,9 @@
+ <artifactId>org.apache.felix.resolver</artifactId>
+ <dependencies>
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.core</artifactId>
+- <version>4.3.0</version>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>org.apache.felix.framework</artifactId>
++ <version>4.0.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+--
+1.7.10.2
+
diff --git a/0002-JDK7-support.patch b/0002-JDK7-support.patch
new file mode 100644
index 0000000..86e904f
--- /dev/null
+++ b/0002-JDK7-support.patch
@@ -0,0 +1,49 @@
+From a0ad08bb71b38bb0d9e234f0677d8243e6cce8c0 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 13:09:59 +0200
+Subject: [PATCH 2/2] JDK7 support
+
+---
+ src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java | 6 +++---
+ src/main/java/org/osgi/service/resolver/Resolver.java | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
+index 1f44d0d..9bac315 100644
+--- a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
++++ b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java
+@@ -73,8 +73,8 @@ public class ResolverImpl implements FelixResolver
+
+ public Map<Resource, List<Wire>> resolve(
+ Environment env,
+- Collection<? extends Resource> mandatoryRevisions,
+- Collection<? extends Resource> optionalRevisions)
++ Collection<Resource> mandatoryRevisions,
++ Collection<Resource> optionalRevisions)
+ {
+ return resolve((FelixEnvironment)env, mandatoryRevisions, optionalRevisions, Collections.EMPTY_SET);
+ }
+@@ -1787,4 +1787,4 @@ public class ResolverImpl implements FelixResolver
+ && m_cap.equals(((Blame) o).m_cap);
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/src/main/java/org/osgi/service/resolver/Resolver.java b/src/main/java/org/osgi/service/resolver/Resolver.java
+index 7c7bbe4..f4bb536 100644
+--- a/src/main/java/org/osgi/service/resolver/Resolver.java
++++ b/src/main/java/org/osgi/service/resolver/Resolver.java
+@@ -105,7 +105,7 @@ public interface Resolver {
+ * if environment is null
+ */
+ Map<Resource, List<Wire>> resolve(Environment environment,
+- Collection<? extends Resource> mandatoryResources,
+- Collection<? extends Resource> optionalResources)
++ Collection<Resource> mandatoryResources,
++ Collection<Resource> optionalResources)
+ throws ResolutionException;
+ }
+--
+1.7.10.2
+
diff --git a/felix-osgi-obr-resolver.spec b/felix-osgi-obr-resolver.spec
new file mode 100644
index 0000000..40a891d
--- /dev/null
+++ b/felix-osgi-obr-resolver.spec
@@ -0,0 +1,93 @@
+%global namedreltag .Beta1
+%global namedversion %{version}%{?namedreltag}
+%global osginame org.apache.felix.resolver
+
+Name: felix-osgi-obr-resolver
+Version: 0.1.0
+Release: 0.2%{namedreltag}%{?dist}
+Summary: Apache Felix Resolver
+Group: Development/Libraries
+License: ASL 2.0
+URL: https://github.com/tdiesler/obr-resolver
+
+# git clone git://github.com/tdiesler/obr-resolver.git
+# cd obr-resolver/ && git archive --format=tar --prefix=felix-osgi-obr-resolver-0.1.0.Beta1/ 0.1.0.Beta1 | xz > felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz
+Source0: felix-osgi-obr-resolver-%{namedversion}.tar.xz
+
+# Provided osgi.core in Fedora is old and the felix impl is the right one in this case
+Patch0: 0001-Use-felix-directly.patch
+Patch1: 0002-JDK7-support.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: felix-framework
+BuildRequires: apache-rat-plugin
+
+Requires: jpackage-utils
+Requires: java
+Requires: felix-framework
+
+%description
+This package contains the Apache Felix Resolver
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n felix-osgi-obr-resolver-%{namedversion}
+
+%patch0 -p1
+%patch1 -p1
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=832420#c2
+rm -rf src/main/java/org/osgi/framework/wiring
+
+%build
+mvn-rpmbuild install javadoc:aggregate
+
+%install
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/felix
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# JAR
+install -pm 644 target/%{osginame}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/felix/%{osginame}.jar
+
+# POM
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.felix-%{osginame}.pom
+
+# DEPMAP
+%add_maven_depmap JPP.felix-%{osginame}.pom felix/%{osginame}.jar
+
+# APIDOCS
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%files
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+%changelog
+* Mon Jun 18 2012 Marek Goldmann <mgoldman at redhat.com> 0.1.0-0.2.Beta1
+- Fixed spelling issues
+- Removed reduntant file
+
+* Thu Jun 14 2012 Marek Goldmann <mgoldman at redhat.com> 0.1.0-0.1.Beta1
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..67341c3 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d92a8b08d7a1b1cbfec5e0889c4791fe felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz
More information about the scm-commits
mailing list