From f02272b20a67a083b91f29ee1f5e8ae654b96d9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 14:25:30 +0200 Subject: [PATCH] Don't use %{_root_bindir} when not building SCL --- 0001-Enable-namespaced-dependency-generation.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch index ae7ed59..f7f31ea 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 77ef9b496bcb84eebfd0f3586226c7645142cc9f Mon Sep 17 00:00:00 2001 +From 3a2ab8067f7f90e1226896dbffb62c5eac83a424 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 @@ -31,7 +31,7 @@ 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..787a9823 100644 +index 7c3ea03d..6925fdbf 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ @@ -40,7 +40,7 @@ index 7c3ea03d..787a9823 100644 -%__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_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 %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:/bin/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))$ --