[javapackages-tools] Backport upstream patch for maven.req
Michal Srb
msrb at fedoraproject.org
Thu Jul 10 13:34:54 UTC 2014
commit 3fac0151974699d28f303252cdd93d69bb1dca0a
Author: Michal Srb <msrb at redhat.com>
Date: Thu Jul 10 15:35:00 2014 +0200
Backport upstream patch for maven.req
...Mvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch | 26 ++++++++++++++++++++
javapackages-tools.spec | 9 ++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
new file mode 100644
index 0000000..0eea72d
--- /dev/null
+++ b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
@@ -0,0 +1,26 @@
+From 9b45dfe3a03e70c1413b7a1a7ee88431a4fe7f4c Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb at redhat.com>
+Date: Thu, 10 Jul 2014 15:30:17 +0200
+Subject: [PATCH] [maven.req] XMvn sets resolvedVersion to UNKNOWN for
+ unresolvable deps
+
+---
+ depgenerators/maven.req | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/depgenerators/maven.req b/depgenerators/maven.req
+index 2e99c1e..f7133d6 100755
+--- a/depgenerators/maven.req
++++ b/depgenerators/maven.req
+@@ -310,7 +310,7 @@ class TagBuilder(object):
+
+ unknown_deps = self.check_deps(metadata)
+ for dependency in metadata.get_required_artifacts():
+- if dependency.requestedVersion == "UNKNOWN":
++ if dependency.resolvedVersion == "UNKNOWN":
+ unknown_deps.append(dependency)
+ continue
+ for skipped in self.skipped_artifacts:
+--
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 600457e..5b75975 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 4.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -8,6 +8,8 @@ License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
+Patch0: 0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch
+
BuildArch: noarch
BuildRequires: asciidoc
@@ -131,6 +133,8 @@ This package provides non-essential macros and scripts to support Java packaging
%prep
%setup -q -n javapackages-%{version}
+%patch0 -p1
+
%build
%configure
./build
@@ -170,6 +174,9 @@ popd
%doc LICENSE
%changelog
+* Thu Jul 10 2014 Michal Srb <msrb at redhat.com> - 4.1.0-2
+- Backport upstream patch for maven.req
+
* Mon Jun 23 2014 Michal Srb <msrb at redhat.com> - 4.1.0-1
- Update to upstream version 4.1.0
More information about the scm-commits
mailing list