From 5267acd60b6e120ab5b8b3be26e3e3b280d84fd9 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 27 Jun 2017 20:27:33 +0100 Subject: [PATCH] Make OSGi dependency on sun.misc package optional. This package is not available in all execution environments and will not be available in Java 9. --- protobuf.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/protobuf.spec b/protobuf.spec index 436dc5c..052ecaf 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -12,7 +12,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://github.com/google/protobuf Source: https://github.com/google/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}.tar.gz @@ -239,6 +239,9 @@ rm java/core/src/test/java/com/google/protobuf/ServiceTest.java %pom_remove_parent javanano %pom_remove_dep org.easymock:easymockclassextension javanano +# Make OSGi dependency on sun.misc package optional +%pom_xpath_inject "pom:configuration/pom:instructions" "sun.misc;resolution:=optional,*" java/core + # Backward compatibility symlink %mvn_file :protobuf-java:jar: %{name}/%{name}-java %{name} @@ -397,6 +400,10 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} %endif %changelog +* Tue Jun 27 2017 Mat Booth - 3.3.1-2 +- Make OSGi dependency on sun.misc package optional. This package is not + available in all execution environments and will not be available in Java 9. + * Mon Jun 12 2017 Orion Poplawski - 3.3.1-1 - Update to 3.3.1