Generate requires on POM artifacts with "pom" extension
This commit is contained in:
parent
d27d04c307
commit
5449a7daaf
28
0001-generate-correct-requires-on-poms.patch
Normal file
28
0001-generate-correct-requires-on-poms.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From fdeb8bb300c10bfda861d602e84d2befd429d1c4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Srb <msrb@redhat.com>
|
||||||
|
Date: Wed, 28 May 2014 08:08:42 +0200
|
||||||
|
Subject: [PATCH] [maven.req] Generate correct requires on POMs
|
||||||
|
|
||||||
|
All POM files in Rawhide should be fixed now
|
||||||
|
---
|
||||||
|
depgenerators/maven.req | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
|
||||||
|
index 5bd6c34..eeab8d6 100755
|
||||||
|
--- a/depgenerators/maven.req
|
||||||
|
+++ b/depgenerators/maven.req
|
||||||
|
@@ -131,10 +131,6 @@ class TagBuilder:
|
||||||
|
version=m_provided.version))
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
- # TODO: remove when not needed
|
||||||
|
- # do not generate requires like "a:b:pom:" yet
|
||||||
|
- if dependency.extension == "pom":
|
||||||
|
- dependency.extension = ""
|
||||||
|
print(dependency.get_rpm_str(dependency.version))
|
||||||
|
|
||||||
|
if unknown_deps:
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: javapackages-tools
|
Name: javapackages-tools
|
||||||
Version: 3.5.0
|
Version: 3.5.0
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
|
|
||||||
Summary: Macros and scripts for Java packaging support
|
Summary: Macros and scripts for Java packaging support
|
||||||
|
|
||||||
@ -17,6 +17,8 @@ Patch2: 0002-test-Fix-testsuite-for-java-headless-change.patch
|
|||||||
Patch3: 0003-macros-Fix-add_maven_depmap-for-SCL-usage.patch
|
Patch3: 0003-macros-Fix-add_maven_depmap-for-SCL-usage.patch
|
||||||
Patch4: 0004-macros-Fix-xmvn-install-for-SCL-usage.patch
|
Patch4: 0004-macros-Fix-xmvn-install-for-SCL-usage.patch
|
||||||
|
|
||||||
|
Patch5: 0001-generate-correct-requires-on-poms.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: jpackage-utils
|
BuildRequires: jpackage-utils
|
||||||
@ -166,6 +168,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 28 2014 Michal Srb <msrb@redhat.com> - 3.5.0-8
|
||||||
|
- Generate requires on POM artifacts with "pom" extension
|
||||||
|
|
||||||
* Wed Apr 30 2014 Michal Srb <msrb@redhat.com> - 3.5.0-7
|
* Wed Apr 30 2014 Michal Srb <msrb@redhat.com> - 3.5.0-7
|
||||||
- Improve support for SCLs
|
- Improve support for SCLs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user