[felix-gogo-command] Dependency to Java 7 added.
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Jan 27 10:57:41 UTC 2012
commit 3ffdf2da773c80b9242de55e73f79860523632e3
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Jan 27 11:57:29 2012 +0100
Dependency to Java 7 added.
felix-gogo-command.spec | 8 ++++++++
java7compatibility.patch | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/felix-gogo-command.spec b/felix-gogo-command.spec
index b39d725..7cdb344 100644
--- a/felix-gogo-command.spec
+++ b/felix-gogo-command.spec
@@ -14,10 +14,13 @@ URL: http://felix.apache.org
Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
Patch0: felix-gogo-command-pom.xml.patch
+Patch1: java7compatibility.patch
BuildArch: noarch
BuildRequires: java
+# This is to ensure we get OpenJDK and not GCJ
+BuildRequires: java-devel >= 1:1.7.0
BuildRequires: maven
BuildRequires: maven-dependency-plugin
BuildRequires: maven-surefire-plugin
@@ -53,6 +56,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1
+%patch1 -p1
%build
mvn-rpmbuild install javadoc:aggregate
@@ -84,6 +88,10 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Fri Jan 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.12.0-2
+- Dependency to Java 7 added.
+- Sources are patched to compile with OpenJDK 7.
+
* Tue Jan 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.12.0-2
- description formatting removed
- jar_repack removed
diff --git a/java7compatibility.patch b/java7compatibility.patch
new file mode 100644
index 0000000..4b95413
--- /dev/null
+++ b/java7compatibility.patch
@@ -0,0 +1,20 @@
+--- a/src/main/java/org/apache/felix/gogo/command/Inspect.java
++++ b/src/main/java/org/apache/felix/gogo/command/Inspect.java
+@@ -102,7 +102,7 @@
+ }
+
+ // Print out any matching generic capabilities.
+- BundleWiring wiring = b.adapt(BundleWiring.class);
++ BundleWiring wiring = (BundleWiring) b.adapt(BundleWiring.class);
+ if (wiring != null)
+ {
+ String title = b + " provides:";
+@@ -277,7 +277,7 @@
+ }
+
+ // Print out any matching generic requirements.
+- BundleWiring wiring = b.adapt(BundleWiring.class);
++ BundleWiring wiring = (BundleWiring) b.adapt(BundleWiring.class);
+ if (wiring != null)
+ {
+ String title = b + " requires:";
More information about the scm-commits
mailing list