Attachment 624212 Details for Bug 819599 – add maven pom -rebase

[patch] add maven pom -rebase

0001-add-maven-pom.patch (text/plain), 2.78 KB, created by gil cattaneo on 2012-10-09 17:55:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-09 17:55:29 UTC

Size: 2.78 KB

patch

obsolete

>From ae662d445753f75514d003e720f8347782452bc8 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 9 Oct 2012 19:54:25 +0200
>Subject: [PATCH] add maven pom
>
>---
> jnr-x86asm.spec |   43 +++++++++++++++++++++++++++++--------------
> 1 files changed, 29 insertions(+), 14 deletions(-)
>
>diff --git a/jnr-x86asm.spec b/jnr-x86asm.spec
>index 20fcc42..6033799 100644
>--- a/jnr-x86asm.spec
>+++ b/jnr-x86asm.spec
>@@ -5,14 +5,15 @@
> 
> Name:           jnr-x86asm
> Version:        0.1
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        Pure-java port of asmjit
> 
> Group:          Development/Libraries
> License:        LGPLv3
> URL:            http://github.com/%{cluster}/%{name}
> Source0:        %{url}/tarball/%{version}/%{cluster}-%{name}-%{version}-%{commit_rev}-%{commit_dl}.tar.gz
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+# remove wagon-svn wagon-webdav
>+Patch0:         jnr-x86asm-0.1-pom.patch
> BuildArch:      noarch
> 
> BuildRequires:  ant
>@@ -36,35 +37,49 @@ Javadoc for %{name}.
> 
> %prep
> %setup -q -n %{cluster}-%{name}-%{git_commit}
>-find ./ -name '*.jar' -exec rm -f '{}' \; 
>-find ./ -name '*.class' -exec rm -f '{}' \; 
>+find ./ -name '*.jar' -delete
>+find ./ -name '*.class' -delete
>+
>+%patch0 -p0
>+sed -i "s|<version>0.1</version>|<version>1.0.0</version>|" pom.xml
> 
> %build
> ant
> 
> %install
>-rm -rf %{buildroot}
>+
> mkdir -p %{buildroot}%{_javadir}
>-cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-ln -s %{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> # javadoc
>-install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
>-cp -r dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
>+install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
>+cp -r dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
>+
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-17
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE COPYING*
> %{_javadir}/*
>+%{_mavenpomdir}/*
>+%{_mavendepmapfragdir}/*
> 
> %files javadoc
>-%defattr(-,root,root,-)
>-%{_javadocdir}/%{name}-%{version}
>+%{_javadocdir}/%{name}
>+%doc LICENSE
> 
> %changelog
>+* Tue Oct 09 2012 gil cattaneo <puntogil@libero.it> - 0.1-6
>+- add maven pom
>+- adapt to current guideline
>+- add %%pre javadoc script
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 819599: 582710 | 624212 | 624218 | 624807