From 44e9cf79a8b2766003e3ac93507b5c474e67ef1c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:54:28 +0200 Subject: [PATCH] Enable namespaced dependency generation --- ...ble-namespaced-dependency-generation.patch | 47 +++++++++++++++++++ javapackages-tools.spec | 7 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0001-Enable-namespaced-dependency-generation.patch diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch new file mode 100644 index 0000000..36b7a0c --- /dev/null +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -0,0 +1,47 @@ +From 0ab5beafeae3b3e926a70331cb88e3ad14755a1d 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 + +--- + depgenerators/fileattrs/javadoc.attr | 2 +- + depgenerators/fileattrs/maven.attr | 4 ++-- + depgenerators/fileattrs/osgi.attr | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr +index bdaeffa5..109b8015 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}} ++%__javadoc_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} + %__javadoc_path ^%{_javadocdir}/.[^/]*$ +diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr +index 2f722eb1..44644ca5 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}} ++%__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}} ++%__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 +--- 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_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_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ +-- +2.21.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index bdfa09e..4c3156d 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -24,6 +24,7 @@ Source0: https://github.com/fedora-java/javapackages/archive/%{version}.t Source1: module-config.xml Patch0: 0001-Move-python-modules-under-java-utils-directory.patch +Patch1: 0001-Enable-namespaced-dependency-generation.patch BuildRequires: coreutils BuildRequires: which @@ -119,6 +120,7 @@ This package provides configuration files for building maven-3.6 module. %prep %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -165,6 +167,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 5.3.1-4 +- Enable namespaced dependency generation + * Fri Jun 28 2019 Mikolaj Izdebski - 5.3.1-3 - Don't ignore duplicate metadata in namespaced modules