diff --git a/0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch b/0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch new file mode 100644 index 0000000..b71d077 --- /dev/null +++ b/0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch @@ -0,0 +1,35 @@ +From 4272dc4bfd1c2945e00c82c27760a3ae6eed28dc Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 Sep 2014 16:48:57 +0200 +Subject: [PATCH] [metadata] Read OSGi Requires from manifest only if osgi.id + property is missing in metadata + +Missing osgi.requires key in properties doesn't mean that we should +always try to read Requires from manifest manually. XMvn skips this +property, if there are no interesting Requires. +--- + python/javapackages/metadata/metadata.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/python/javapackages/metadata/metadata.py b/python/javapackages/metadata/metadata.py +index b7c4c9f..5b507e3 100644 +--- a/python/javapackages/metadata/metadata.py ++++ b/python/javapackages/metadata/metadata.py +@@ -200,7 +200,13 @@ class Metadata(object): + reqs |= set(content.split(',')) + continue + except KeyError: +- pass ++ try: ++ osgi_id = artifact.properties["osgi.id"] ++ # this file was already processed by XMvn and ++ # there are no interesting OSGi requires, move on ++ continue ++ except KeyError: ++ pass + if artifact.path: + import javapackages.common.osgi as osgi + r = osgi.get_requires(artifact.get_buildroot_path()) +-- +1.9.3 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 7dd9722..d95b541 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Macros and scripts for Java packaging support @@ -15,6 +15,7 @@ License: BSD URL: https://git.fedorahosted.org/git/javapackages.git Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz Patch0: 0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch +Patch1: 0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch BuildArch: noarch @@ -167,6 +168,7 @@ This package provides non-essential macros and scripts to support Java packaging %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 %if 0%{?with_python3} find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|' @@ -232,6 +234,9 @@ popd %doc LICENSE %changelog +* Wed Sep 24 2014 Michal Srb - 4.2.0-3 +- Do not generate OSGi R on eclipse-platform + * Thu Sep 18 2014 Michal Srb - 4.2.0-2 - Fix mvn_artifact: generate R, if it's not explicitly disabled