From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Sep 2019 18:10:01 +0200 Subject: [PATCH 3/3] Fix use of illegal characters in rpmfc generator names --- configure-base.sh | 2 +- depgenerators/fileattrs/javadoc.attr | 6 +++--- depgenerators/fileattrs/maven.attr | 10 +++++----- depgenerators/fileattrs/osgi.attr | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure-base.sh b/configure-base.sh index dbfc3e05..4b5a9172 100644 --- a/configure-base.sh +++ b/configure-base.sh @@ -64,5 +64,5 @@ test -z "${default_jdk}" && default_jdk="${jvmdir}/java" test -z "${default_jre}" && default_jre="${jvmdir}/jre" test -z "${scl_root_relative}" -a -n "${scl_root}" && scl_root_relative=$(sed "s:^/*::" <<<"${scl_root}") -scl_suffix="${scl:+.$scl}" +scl_suffix="${scl:+_${scl//-/_}}" return 0 diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr index 109b8015..1f3a8475 100644 --- a/depgenerators/fileattrs/javadoc.attr +++ b/depgenerators/fileattrs/javadoc.attr @@ -1,3 +1,3 @@ -%__javadoc_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req -%__javadoc_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} -%__javadoc_path ^%{_javadocdir}/.[^/]*$ +%__javadoc@{scl_suffix}_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req +%__javadoc@{scl_suffix}_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} +%__javadoc@{scl_suffix}_path ^%{_javadocdir}/.[^/]*$ diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr index 44644ca5..26026658 100644 --- a/depgenerators/fileattrs/maven.attr +++ b/depgenerators/fileattrs/maven.attr @@ -1,5 +1,5 @@ -%__maven_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov -%__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}} -%__maven_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req -%__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/.* +%__maven@{scl_suffix}_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov +%__maven@{scl_suffix}_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} +%__maven@{scl_suffix}_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req +%__maven@{scl_suffix}_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@{scl_suffix}_path ^%{_datadir}/maven-metadata/.* diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr index 3ccc8b65..8b0f15f7 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}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} -%__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))$ +%__osgi@{scl_suffix}_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov +%__osgi@{scl_suffix}_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@{scl_suffix}_requires %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:true} +%__osgi@{scl_suffix}_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} +%__osgi@{scl_suffix}_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ -- 2.21.0