diff --git a/0001-generate-correct-requires-on-poms.patch b/0001-generate-correct-requires-on-poms.patch new file mode 100644 index 0000000..5805d06 --- /dev/null +++ b/0001-generate-correct-requires-on-poms.patch @@ -0,0 +1,28 @@ +From fdeb8bb300c10bfda861d602e84d2befd429d1c4 Mon Sep 17 00:00:00 2001 +From: Michal Srb +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 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index b1dbe8a..8a6e246 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.5.0 -Release: 7%{?dist} +Release: 8%{?dist} 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 Patch4: 0004-macros-Fix-xmvn-install-for-SCL-usage.patch +Patch5: 0001-generate-correct-requires-on-poms.patch + BuildArch: noarch BuildRequires: jpackage-utils @@ -166,6 +168,9 @@ popd %changelog +* Wed May 28 2014 Michal Srb - 3.5.0-8 +- Generate requires on POM artifacts with "pom" extension + * Wed Apr 30 2014 Michal Srb - 3.5.0-7 - Improve support for SCLs