Fix use of illegal characters in rpmfc generator names

0001-Move-python-modules-under-java-utils-directory.patch

@@ -1,138 +1,147 @@
-From 563a9c81f2ee7f2631a40e89ec2897d0af268294 Mon Sep 17 00:00:00 2001
+From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 26 Apr 2019 00:50:00 +0200
-Subject: [PATCH] Move python modules under java-utils directory
+Subject: [PATCH 1/3] Move python modules under java-utils directory
 
 ---
- depgenerators/javadoc.req        | 2 ++
+ depgenerators/javadoc.req        | 3 +++
- depgenerators/maven.prov         | 1 +
+ depgenerators/maven.prov         | 2 ++
- depgenerators/maven.req          | 1 +
+ depgenerators/maven.req          | 2 ++
- depgenerators/osgi.prov          | 1 +
+ depgenerators/osgi.prov          | 2 ++
- depgenerators/osgi.req           | 1 +
+ depgenerators/osgi.req           | 2 ++
- java-utils/builddep.py           | 1 +
+ java-utils/builddep.py           | 2 ++
- java-utils/maven_depmap.py       | 1 +
+ java-utils/maven_depmap.py       | 2 ++
- java-utils/mvn_alias.py          | 1 +
+ java-utils/mvn_alias.py          | 2 ++
- java-utils/mvn_artifact.py       | 3 ++-
+ java-utils/mvn_artifact.py       | 4 +++-
- java-utils/mvn_build.py          | 1 +
+ java-utils/mvn_build.py          | 2 ++
- java-utils/mvn_compat_version.py | 1 +
+ java-utils/mvn_compat_version.py | 2 ++
- java-utils/mvn_config.py         | 1 +
+ java-utils/mvn_config.py         | 2 ++
- java-utils/mvn_file.py           | 1 +
+ java-utils/mvn_file.py           | 2 ++
- java-utils/mvn_package.py        | 1 +
+ java-utils/mvn_package.py        | 2 ++
- java-utils/pom_editor.py         | 1 +
+ java-utils/pom_editor.py         | 2 ++
- java-utils/request-artifact.py   | 1 +
+ java-utils/request-artifact.py   | 2 ++
- 16 files changed, 18 insertions(+), 1 deletion(-)
+ 16 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req
-index 4d182e2e..b300410c 100755
+index 4d182e2e..8528ee05 100755
 --- a/depgenerators/javadoc.req
 +++ b/depgenerators/javadoc.req
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,9 @@
  # Authors:  Michael Simacek <msimacek@redhat.com>
  #           Michal Srb <msrb@redhat.com>
  
 +import sys
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.common.config import get_config
  
  config = get_config()
 diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
-index 1448cbf6..da67d896 100755
+index 1448cbf6..c794dbea 100755
 --- a/depgenerators/maven.prov
 +++ b/depgenerators/maven.prov
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,8 @@
  
  import sys
  import traceback
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.cache.metadata import MetadataCache
  from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
  
 diff --git a/depgenerators/maven.req b/depgenerators/maven.req
-index b3597f78..00aede89 100755
+index b3597f78..912d5f98 100755
 --- a/depgenerators/maven.req
 +++ b/depgenerators/maven.req
-@@ -37,6 +37,7 @@ import re
+@@ -37,6 +37,8 @@ import re
  import sys
  import traceback
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.common.config import get_config
  from javapackages.common.util import (kill_parent_process,
                                        init_rpmgen,
 diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
-index baef6e48..20fc3ff2 100755
+index baef6e48..7ed423a2 100755
 --- a/depgenerators/osgi.prov
 +++ b/depgenerators/osgi.prov
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,8 @@
  import sys
  import os
  import traceback
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.cache.osgi import OSGiCache
  from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
  
 diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
-index 3cb53302..5278c6f9 100755
+index 3cb53302..79dcaaa8 100755
 --- a/depgenerators/osgi.req
 +++ b/depgenerators/osgi.req
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,8 @@
  import sys
  import os
  import traceback
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.cache.osgi import OSGiCache
  from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
  
 diff --git a/java-utils/builddep.py b/java-utils/builddep.py
-index fda36d2d..475e1bd2 100644
+index fda36d2d..48d0963d 100644
 --- a/java-utils/builddep.py
 +++ b/java-utils/builddep.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import optparse
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
                                           ArtifactValidationException)
  from javapackages.common.util import args_to_unicode
 diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
-index 92e0ff4c..65994a9e 100644
+index 92e0ff4c..9f1472a6 100644
 --- a/java-utils/maven_depmap.py
 +++ b/java-utils/maven_depmap.py
-@@ -46,6 +46,7 @@ import zipfile
+@@ -46,6 +46,8 @@ import zipfile
  from time import gmtime, strftime
  from copy import deepcopy
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.pom import POM
  from javapackages.metadata.artifact import MetadataArtifact
  from javapackages.metadata.alias import MetadataAlias
 diff --git a/java-utils/mvn_alias.py b/java-utils/mvn_alias.py
-index 4979a17a..542ac204 100644
+index 4979a17a..962a35f0 100644
 --- a/java-utils/mvn_alias.py
 +++ b/java-utils/mvn_alias.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import optparse
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
                                           ArtifactValidationException)
  from javapackages.xmvn.xmvn_config import XMvnConfig
 diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
-index d135adf2..386bda36 100644
+index d135adf2..51339d4b 100644
 --- a/java-utils/mvn_artifact.py
 +++ b/java-utils/mvn_artifact.py
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,9 @@
  
  from __future__ import print_function
  
 +import sys
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.metadata.metadata import Metadata
  from javapackages.metadata.artifact import MetadataArtifact
  from javapackages.metadata.dependency import MetadataDependency
-@@ -45,7 +47,6 @@ from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest,
+@@ -45,7 +48,6 @@ from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest,
  from javapackages.common.util import args_to_unicode
  from javapackages.common.exception import JavaPackagesToolsException
  
@@ -141,86 +150,93 @@ index d135adf2..386bda36 100644
  import lxml.etree
  from optparse import OptionParser
 diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
-index 98479962..1723e2d0 100644
+index 98479962..4d5f54f7 100644
 --- a/java-utils/mvn_build.py
 +++ b/java-utils/mvn_build.py
-@@ -37,6 +37,7 @@ import optparse
+@@ -37,6 +37,8 @@ import optparse
  import subprocess
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import Artifact
  from javapackages.xmvn.xmvn_config import XMvnConfig
  from javapackages.common.util import args_to_unicode, command_exists
 diff --git a/java-utils/mvn_compat_version.py b/java-utils/mvn_compat_version.py
-index e4afdbd7..6ad96d9b 100644
+index e4afdbd7..d63dcf99 100644
 --- a/java-utils/mvn_compat_version.py
 +++ b/java-utils/mvn_compat_version.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import optparse
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
                                           ArtifactValidationException)
  from javapackages.xmvn.xmvn_config import XMvnConfig
 diff --git a/java-utils/mvn_config.py b/java-utils/mvn_config.py
-index 7597761e..2f88735a 100644
+index 7597761e..f7930985 100644
 --- a/java-utils/mvn_config.py
 +++ b/java-utils/mvn_config.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import sys
  import optparse
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.xmvn.xmvn_config import XMvnConfig
  from javapackages.common.util import args_to_unicode
  from javapackages.common.exception import JavaPackagesToolsException
 diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py
-index 39d1348f..7526f95c 100644
+index 39d1348f..40ae156e 100644
 --- a/java-utils/mvn_file.py
 +++ b/java-utils/mvn_file.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import optparse
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
                                           ArtifactValidationException)
  from javapackages.xmvn.xmvn_config import XMvnConfig, XMvnConfigException
 diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
-index b74da128..01d9ddda 100644
+index b74da128..2a2f4619 100644
 --- a/java-utils/mvn_package.py
 +++ b/java-utils/mvn_package.py
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,8 @@
  import optparse
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
                                           ArtifactValidationException)
  from javapackages.xmvn.xmvn_config import XMvnConfig
 diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
-index 82a555b8..bc144f43 100644
+index 82a555b8..6c09665c 100644
 --- a/java-utils/pom_editor.py
 +++ b/java-utils/pom_editor.py
-@@ -11,6 +11,7 @@ import io
+@@ -11,6 +11,8 @@ import io
  from lxml import etree
  from os import path
  from textwrap import dedent
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.common.exception import JavaPackagesToolsException
  
  # all macro fuctions that can be called from external world
 diff --git a/java-utils/request-artifact.py b/java-utils/request-artifact.py
-index 68cb1119..542e538e 100644
+index 68cb1119..55dfd985 100644
 --- a/java-utils/request-artifact.py
 +++ b/java-utils/request-artifact.py
-@@ -35,6 +35,7 @@ from __future__ import print_function
+@@ -35,6 +35,8 @@ from __future__ import print_function
  
  import sys
  
 +sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
  from javapackages.common.mock import (InstallationException, ConnectionException,
                                        install_maven_artifact)
  

0002-Enable-namespaced-dependency-generation.patch

@@ -1,7 +1,7 @@
-From a1b5c681d01e2d600f5c502e2c2e3bba8aa9d447 Mon Sep 17 00:00:00 2001
+From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 28 Jun 2019 14:53:26 +0200
-Subject: [PATCH] Enable namespaced dependency generation
+Subject: [PATCH 2/3] Enable namespaced dependency generation
 
 ---
  depgenerators/fileattrs/javadoc.attr | 2 +-

0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch

@@ -0,0 +1,67 @@
+From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+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
+

javapackages-tools.spec

@@ -33,8 +33,9 @@ BuildArch:      noarch
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source1:        module-config.xml
 
-Patch0:         0001-Move-python-modules-under-java-utils-directory.patch
+Patch1:         0001-Move-python-modules-under-java-utils-directory.patch
-Patch1:         0001-Enable-namespaced-dependency-generation.patch
+Patch2:         0002-Enable-namespaced-dependency-generation.patch
+Patch3:         0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
 
 BuildRequires:  coreutils
 BuildRequires:  which
@@ -129,8 +130,9 @@ This package provides configuration files for building maven-3.6 module.
 
 %prep
 %setup -q -n javapackages-%{version}
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 sed -i '/^manpage /d' build
 sed -i '/${mandir}/d' install