|
 |
103ab0 |
From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
|
|
|
103ab0 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
103ab0 |
Date: Fri, 28 Jun 2019 14:53:26 +0200
|
|
|
103ab0 |
Subject: [PATCH 2/3] Enable namespaced dependency generation
|
|
|
103ab0 |
|
|
|
103ab0 |
---
|
|
|
103ab0 |
depgenerators/fileattrs/javadoc.attr | 2 +-
|
|
|
103ab0 |
depgenerators/fileattrs/maven.attr | 4 ++--
|
|
|
103ab0 |
depgenerators/fileattrs/osgi.attr | 6 +++---
|
|
|
103ab0 |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
103ab0 |
|
|
|
103ab0 |
diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr
|
|
|
103ab0 |
index bdaeffa5..109b8015 100644
|
|
|
103ab0 |
--- a/depgenerators/fileattrs/javadoc.attr
|
|
|
103ab0 |
+++ b/depgenerators/fileattrs/javadoc.attr
|
|
|
103ab0 |
@@ -1,3 +1,3 @@
|
|
|
103ab0 |
%__javadoc_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req
|
|
|
103ab0 |
-%__javadoc_requires_opts %{?scl:--scl %{?scl}}
|
|
|
103ab0 |
+%__javadoc_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
|
|
|
103ab0 |
%__javadoc_path ^%{_javadocdir}/.[^/]*$
|
|
|
103ab0 |
diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr
|
|
|
103ab0 |
index 2f722eb1..44644ca5 100644
|
|
|
103ab0 |
--- a/depgenerators/fileattrs/maven.attr
|
|
|
103ab0 |
+++ b/depgenerators/fileattrs/maven.attr
|
|
|
103ab0 |
@@ -1,5 +1,5 @@
|
|
|
103ab0 |
%__maven_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov
|
|
|
103ab0 |
-%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
|
|
|
103ab0 |
+%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
|
|
|
103ab0 |
%__maven_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req
|
|
|
103ab0 |
-%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
|
|
|
103ab0 |
+%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
|
|
|
103ab0 |
%__maven_path ^%{_datadir}/maven-metadata/.*
|
|
|
103ab0 |
diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
|
|
|
103ab0 |
index 7c3ea03d..3ccc8b65 100644
|
|
|
103ab0 |
--- a/depgenerators/fileattrs/osgi.attr
|
|
|
103ab0 |
+++ b/depgenerators/fileattrs/osgi.attr
|
|
|
103ab0 |
@@ -1,5 +1,5 @@
|
|
|
103ab0 |
%__osgi_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov
|
|
|
103ab0 |
-%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
|
|
|
103ab0 |
-%__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true}
|
|
|
103ab0 |
-%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
|
|
|
103ab0 |
+%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
|
|
|
103ab0 |
+%__osgi_requires %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:true}
|
|
|
103ab0 |
+%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
|
|
|
103ab0 |
%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
|
|
103ab0 |
--
|
|
|
103ab0 |
2.21.0
|
|
|
103ab0 |
|