From 77d01be3e33dc3dd2f38ecca6857dc0d872376e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 10:23:49 +0200 Subject: [PATCH] Disable OSGi requires generation for namespaced modules --- ...-Enable-namespaced-dependency-generation.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch index 36b7a0c..ae7ed59 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 0ab5beafeae3b3e926a70331cb88e3ad14755a1d Mon Sep 17 00:00:00 2001 +From 77ef9b496bcb84eebfd0f3586226c7645142cc9f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 Subject: [PATCH] Enable namespaced dependency generation @@ -6,8 +6,8 @@ Subject: [PATCH] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- depgenerators/fileattrs/maven.attr | 4 ++-- - depgenerators/fileattrs/osgi.attr | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) + depgenerators/fileattrs/osgi.attr | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr index bdaeffa5..109b8015 100644 @@ -31,16 +31,17 @@ index 2f722eb1..44644ca5 100644 +%__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}} %__maven_path ^%{_datadir}/maven-metadata/.* diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr -index 7c3ea03d..a0d4e87f 100644 +index 7c3ea03d..787a9823 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ %__osgi_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov -%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} -+%__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}} - %__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true} +-%__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true} -%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} -+%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} ++%__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}} ++%__osgi_requires %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:%{_root_bindir}/true} ++%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ -- 2.21.0