Fix mvn_artifact: generate R, if it's not explicitly disabled
This commit is contained in:
parent
ee8847f60a
commit
9860c4d5e3
@ -0,0 +1,26 @@
|
|||||||
|
From 928ebac767c95dc39f3b31a6260983cecc3e473b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Srb <msrb@redhat.com>
|
||||||
|
Date: Thu, 18 Sep 2014 10:48:07 +0200
|
||||||
|
Subject: [PATCH] [mvn_artifact] Append dependencies to metadata, if we have
|
||||||
|
them
|
||||||
|
|
||||||
|
---
|
||||||
|
java-utils/mvn_artifact.py | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
|
||||||
|
index ae17f9f..78074f0 100644
|
||||||
|
--- a/java-utils/mvn_artifact.py
|
||||||
|
+++ b/java-utils/mvn_artifact.py
|
||||||
|
@@ -301,6 +301,8 @@ if __name__ == "__main__":
|
||||||
|
mvn_deps = gather_dependencies(pom_path)
|
||||||
|
for d in mvn_deps:
|
||||||
|
deps.append(MetadataDependency.from_mvn_dependency(d))
|
||||||
|
+ if deps:
|
||||||
|
+ art.dependencies = set(deps)
|
||||||
|
else:
|
||||||
|
art.properties['xmvn.resolver.disableEffectivePom'] = 'true'
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
@ -7,13 +7,14 @@
|
|||||||
|
|
||||||
Name: javapackages-tools
|
Name: javapackages-tools
|
||||||
Version: 4.2.0
|
Version: 4.2.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Summary: Macros and scripts for Java packaging support
|
Summary: Macros and scripts for Java packaging support
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://git.fedorahosted.org/git/javapackages.git
|
URL: https://git.fedorahosted.org/git/javapackages.git
|
||||||
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
|
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
|
||||||
|
Patch0: 0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -165,6 +166,8 @@ This package provides non-essential macros and scripts to support Java packaging
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n javapackages-%{version}
|
%setup -q -n javapackages-%{version}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
|
find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
|
||||||
find ./depgenerators -name '*.req' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
|
find ./depgenerators -name '*.req' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
|
||||||
@ -229,6 +232,9 @@ popd
|
|||||||
%doc LICENSE
|
%doc LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 18 2014 Michal Srb <msrb@redhat.com> - 4.2.0-2
|
||||||
|
- Fix mvn_artifact: generate R, if it's not explicitly disabled
|
||||||
|
|
||||||
* Thu Jul 24 2014 Michal Srb <msrb@redhat.com> - 4.2.0-1
|
* Thu Jul 24 2014 Michal Srb <msrb@redhat.com> - 4.2.0-1
|
||||||
- Update to upstream version 4.2.0
|
- Update to upstream version 4.2.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user