[jpackage-utils] Reimplement %update_maven_depmap as NOOP

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Dec 13 10:02:33 UTC 2012


commit de36af3ec773b020f541035f6b6a0ed0bb6177cf
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Dec 13 10:50:34 2012 +0100

    Reimplement %update_maven_depmap as NOOP

 jpackage-utils-update-maven-depmap.patch |   15 +++++++++++++++
 jpackage-utils.spec                      |    6 ++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/jpackage-utils-update-maven-depmap.patch b/jpackage-utils-update-maven-depmap.patch
new file mode 100644
index 0000000..51898d5
--- /dev/null
+++ b/jpackage-utils-update-maven-depmap.patch
@@ -0,0 +1,15 @@
+--- misc/macros.jpackage~	2012-12-03 17:03:13.084454193 +0100
++++ misc/macros.jpackage	2012-12-03 18:01:15.727181161 +0100
+@@ -173,11 +173,7 @@
+ # update_maven_depmap updates the main maven depmap
+ #
+ %update_maven_depmap() \
+-echo -e "<dependencies>\\n" > %{_mavendepmapdir}/maven2-depmap.xml\
+-if [ -d %{_mavendepmapfragdir} ] && [ -n "`find %{_mavendepmapfragdir} -type f`" ]; then\
+-cat %{_mavendepmapfragdir}/* >> %{_mavendepmapdir}/maven2-depmap.xml\
+-fi\
+-echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml\
++:\
+ %{nil}
+ 
+ #==============================================================================
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 5bcef21..574f7d3 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -50,6 +50,7 @@ Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
 Patch4:         %{name}-jnidir.patch
 Patch5:         %{name}-build-classpath-symlink-fix.patch
+Patch6:         %{name}-update-maven-depmap.patch
 Group:          Utilities
 
 Requires:       coreutils
@@ -73,6 +74,7 @@ information.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
@@ -214,6 +216,10 @@ EOF
 
 
 %changelog
+* Thu Dec 13 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-23
+- Reimplement %%update_maven_depmap as NOOP
+- Resolves: rhbz#882537
+
 * Tue Dec 11 2012 Deepak Bhole <dbhole at redhat.com> 1.7.5-21
 - rhbz#862001: Updated patches to java-functions so that no .orig is produced
 


More information about the scm-commits mailing list