Attachment 656844 Details for Bug 882537 – Proposed patch

[patch] Proposed patch

0001-Reimplement-update_maven_depmap-as-NOOP.patch (text/plain), 3.02 KB, created by Mikolaj Izdebski on 2012-12-03 17:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2012-12-03 17:11:11 UTC

Size: 3.02 KB

patch

obsolete

>From fe30b09568905c953302f93d93beb4f7ce9e64d8 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Mon, 3 Dec 2012 18:06:56 +0100
>Subject: [PATCH] Reimplement %update_maven_depmap as NOOP
>
>---
> jpackage-utils-update-maven-depmap.patch | 15 +++++++++++++++
> jpackage-utils.spec                      | 12 ++++++++----
> 2 files changed, 23 insertions(+), 4 deletions(-)
> create mode 100644 jpackage-utils-update-maven-depmap.patch
>
>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 c0949f3..23e90d6 100644
>--- a/jpackage-utils.spec
>+++ b/jpackage-utils.spec
>@@ -36,7 +36,7 @@
> 
> Name:           jpackage-utils
> Version:        1.7.5
>-Release:        21%{?dist}
>+Release:        22%{?dist}
> Epoch:          0
> Summary:        JPackage utilities
> License:        BSD
>@@ -44,12 +44,12 @@ URL:            http://www.jpackage.org/
> Source0:        %{name}-%{version}.tar.bz2
> Source1:        %{name}-README
> Source2:        abs2rel.sh
>-Source3:        abs2rel.lua
> Patch1:         %{name}-own-mavendirs.patch
> 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
>@@ -75,8 +75,9 @@ information.
> %patch3 -p1
> %patch4 -p1
> %patch5 -p1
>+%patch6
> 
>-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
>+cp -p %{SOURCE1} %{SOURCE2} .
> 
> %build
> echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
>@@ -129,7 +130,6 @@ install -pm 644 etc/font.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/java
> 
> # Install abs2rel scripts
> install -pm 755 abs2rel.sh  ${RPM_BUILD_ROOT}%{_javadir}-utils
>-install -pm 644 abs2rel.lua ${RPM_BUILD_ROOT}%{_javadir}-utils
> 
> # Create an initial (empty) depmap
> echo -e "<dependencies>\\n" \
>@@ -216,6 +216,10 @@ EOF
> 
> 
> %changelog
>+* Mon Dec  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.5-22
>+- Reimplement %%update_maven_depmap as NOOP
>+- Resolves: rhbz#882537
>+
> * Mon Dec  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.5-21
> - Reimplement abs2rel.sh using perl File::Spec module
> - Resolves: rhbz#823669
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 882537: 656844