|
 |
8537130 |
From 401ab7370d01627b4fc1a57d454276d788f18e39 Mon Sep 17 00:00:00 2001
|
|
|
8537130 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
8537130 |
Date: Thu, 20 Nov 2014 16:22:52 +0100
|
|
|
cf17376 |
Subject: [PATCH 5/6] Improve patterns for matching OSGi manifests
|
|
|
8537130 |
|
|
|
8537130 |
---
|
|
|
8537130 |
depgenerators/fileattrs/osgi.attr | 2 +-
|
|
|
8537130 |
depgenerators/osgi.prov | 2 +-
|
|
|
8537130 |
depgenerators/osgi.req | 2 +-
|
|
|
8537130 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
8537130 |
|
|
|
8537130 |
diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
|
|
|
8537130 |
index ae858b5..83e8c8d 100644
|
|
|
8537130 |
--- a/depgenerators/fileattrs/osgi.attr
|
|
|
8537130 |
+++ b/depgenerators/fileattrs/osgi.attr
|
|
|
8537130 |
@@ -1,4 +1,4 @@
|
|
|
8537130 |
%__osgi_provides %{_rpmconfigdir}/osgi.prov
|
|
|
8537130 |
%__osgi_requires %{_rpmconfigdir}/osgi.req
|
|
|
8537130 |
-%__osgi_path ^(.*\\.jar$|((%{_prefix}/lib|%{_datadir})/.*/MANIFEST.MF))
|
|
|
8537130 |
+%__osgi_path ^(.*\\.jar|((%{_prefix}/lib|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
|
|
8537130 |
|
|
|
8537130 |
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
|
|
|
8537130 |
index 53b2cb4..bd4cfd8 100755
|
|
|
8537130 |
--- a/depgenerators/osgi.prov
|
|
|
8537130 |
+++ b/depgenerators/osgi.prov
|
|
|
8537130 |
@@ -81,7 +81,7 @@ class TagBuilder:
|
|
|
8537130 |
|
|
|
8537130 |
def get_osgi_provide (self, path):
|
|
|
8537130 |
if not os.path.islink(path):
|
|
|
8537130 |
- if path.endswith("META-INF/MANIFEST.MF"):
|
|
|
8537130 |
+ if path.endswith("/META-INF/MANIFEST.MF"):
|
|
|
8537130 |
manifest = open(path)
|
|
|
8537130 |
self.handle_manifest(manifest)
|
|
|
8537130 |
if zipfile.is_zipfile(path):
|
|
|
8537130 |
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
|
|
|
8537130 |
index 8d657db..1c0111c 100755
|
|
|
8537130 |
--- a/depgenerators/osgi.req
|
|
|
8537130 |
+++ b/depgenerators/osgi.req
|
|
|
8537130 |
@@ -93,7 +93,7 @@ class TagBuilder:
|
|
|
8537130 |
|
|
|
8537130 |
def get_osgi_require (self, path):
|
|
|
8537130 |
if not os.path.islink(path):
|
|
|
8537130 |
- if path.endswith("META-INF/MANIFEST.MF"):
|
|
|
8537130 |
+ if path.endswith("/META-INF/MANIFEST.MF"):
|
|
|
8537130 |
manifest = open(path)
|
|
|
8537130 |
self.print_requires(manifest)
|
|
|
8537130 |
if zipfile.is_zipfile(path):
|
|
|
8537130 |
--
|
|
|
8537130 |
1.9.3
|
|
|
8537130 |
|