Attachment 703840 Details for Bug 911559 – Proposed patch

[patch] Proposed patch

mizdebsk_rhbz911559.patch (text/plain), 2.41 KB, created by Mikolaj Izdebski on 2013-02-28 08:29:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2013-02-28 08:29:27 UTC

Size: 2.41 KB

patch

obsolete

>From 41b70324aa924f391267d7ca0360cacbea063a2e Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Thu, 28 Feb 2013 09:29:07 +0100
>Subject: [PATCH] Install versioned JAR and POM
>
>- Add missing BR: animal-sniffer
>- Resolves: rhbz#911559
>---
> jline2.spec | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/jline2.spec b/jline2.spec
>index abba096..b998144 100644
>--- a/jline2.spec
>+++ b/jline2.spec
>@@ -1,6 +1,6 @@
> Name:             jline2
> Version:          2.10
>-Release:          3%{?dist}
>+Release:          4%{?dist}
> Summary:          JLine is a Java library for handling console input
> Group:            Development/Libraries
> License:          BSD and ASL 2.0
>@@ -19,6 +19,7 @@ BuildRequires:    maven-compiler-plugin
> BuildRequires:    maven-jar-plugin
> BuildRequires:    maven-surefire-plugin
> BuildRequires:    maven-install-plugin
>+BuildRequires:    animal-sniffer
> BuildRequires:    junit4
> BuildRequires:    jansi
> BuildRequires:    fusesource-pom
>@@ -62,18 +63,18 @@ mvn-rpmbuild install javadoc:aggregate
> 
> %install
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-cp -p target/jline-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+cp -p target/jline-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
> 
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-%{version}.pom
> 
> # Uh, oh...
> # http://sourceforge.net/mailarchive/message.php?msg_id=27330388
> # https://github.com/jline/jline2/commit/7a4d27430999706f0fd30b4548d5879275a88de2#pom.xml
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jline:jline"
>+%add_maven_depmap JPP-%{name}-%{version}.pom %{name}-%{version}.jar -a "jline:jline"
> 
> %files
> %{_mavenpomdir}/*
>@@ -86,6 +87,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %doc LICENSE.txt
> 
> %changelog
>+* Thu Feb 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.10-4
>+- Install versioned JAR and POM
>+- Add missing BR: animal-sniffer
>+- Resolves: rhbz#911559
>+
> * Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.10-3
> - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
> - Replace maven BuildRequires with maven-local
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 911559: 703840 | 703843