From fcf9584ca4dc0a97127a10b88134a94bb272b815 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 14:46:52 +0200 Subject: [PATCH] Don't hardcode path to /bin/true, rely on PATH --- 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 f7f31ea..4e76ff3 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 3a2ab8067f7f90e1226896dbffb62c5eac83a424 Mon Sep 17 00:00:00 2001 +From a1b5c681d01e2d600f5c502e2c2e3bba8aa9d447 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..6925fdbf 100644 +index 7c3ea03d..3ccc8b65 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ @@ -40,7 +40,7 @@ index 7c3ea03d..6925fdbf 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:/bin/true} ++%__osgi_requires %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix: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))$ --