Attachment 624870 Details for Bug 819851 – add maven pom -rebase with gcc 4.7 build fix

[patch] add maven pom -rebase with gcc 4.7 build fix

0001-add-maven-pom.patch (text/plain), 3.37 KB, created by gil cattaneo on 2012-10-10 13:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-10 13:20:17 UTC

Size: 3.37 KB

patch

obsolete

>From 3e89fc8e801d2e38d50e5570f66b117e362f1e5b Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Wed, 10 Oct 2012 15:17:12 +0200
>Subject: [PATCH] add maven pom
>
>---
> jffi.spec |   44 +++++++++++++++++++++++++++++++-------------
> 1 files changed, 31 insertions(+), 13 deletions(-)
>
>diff --git a/jffi.spec b/jffi.spec
>index a85e5a9..c38b7ca 100644
>--- a/jffi.spec
>+++ b/jffi.spec
>@@ -3,12 +3,12 @@
> 
> Name:    jffi
> Version: 1.0.10
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: An optimized Java interface to libffi 
> 
> Group:   System Environment/Libraries
> License: LGPLv3
>-URL:     http://github.com/%{cluster}/%{name}
>+URL:     http://github.com/wmeissner/jffi
> Source0: https://download.github.com/%{cluster}-%{name}-%{version}-0-g%{git_commit}.tar.gz
> Patch0:  fix_dependencies_in_build_xml.patch
> Patch1:  fix_jar_dependencies.patch
>@@ -42,9 +42,14 @@ This package contains the API documentation for %{name}.
> %patch1
> %patch2
> 
>+%pom_remove_plugin :maven-antrun-plugin
>+%pom_xpath_remove pom:extensions
>+
> # ppc{,64} fix
> # https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9
> sed -i.cpu -e '/m\$(MODEL)/d' jni/GNUmakefile libtest/GNUmakefile
>+# see https://github.com/ffi/ffi/issues/189
>+sed -i.gcc47 -e 's/ -mimpure-text/ -fpic/' jni/GNUmakefile jni/GNUmakefile.cpu libtest/GNUmakefile libtest/GNUmakefile.cpu
> %ifnarch %{ix86} x86_64
> rm -rf test/
> %endif
>@@ -55,8 +60,8 @@ chmod 0644 jni/jffi/jffi.h
> # remove uneccessary directories
> rm -rf archive/ jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*
> 
>-find ./ -name '*.jar' -exec rm -f '{}' \; 
>-find ./ -name '*.class' -exec rm -f '{}' \; 
>+find ./ -name '*.jar' -delete
>+find ./ -name '*.class' -delete
> 
> %build
> mkdir lib/build_lib
>@@ -65,16 +70,20 @@ build-jar-repository -s -p lib/build_lib junit junit4
> ant
> 
> %install
>-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
>-mkdir -p $RPM_BUILD_ROOT%{_jnidir}
> 
>-cp build/jni/libjffi-1.0.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
>-cp dist/jffi-complete.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-%{version}.jar
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
>-ln -s %{_libdir}/%{name}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar
>+mkdir -p %{buildroot}%{_libdir}/%{name}
>+mkdir -p %{buildroot}%{_jnidir}
>+
>+cp build/jni/libjffi-1.0.so %{buildroot}%{_libdir}/%{name}/
>+cp dist/jffi-complete.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar
>+ln -s %{_libdir}/%{name}/%{name}.jar %{buildroot}%{_jnidir}/%{name}.jar
> 
>-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-cp -rp dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/jffi
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
>+
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -rp dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
> 
> %check
> ant test
>@@ -82,11 +91,20 @@ ant test
> %files
> %{_libdir}/%{name}/
> %{_jnidir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+%doc COPYING.* LICENSE
> 
> %files javadoc
>-%{_javadocdir}/jffi
>+%{_javadocdir}/%{name}
>+%doc COPYING.* LICENSE
> 
> %changelog
>+* Tue Oct 09 2012 gil cattaneo <puntogil@libero.it> - 1.0.10-4
>+- add maven pom
>+- adapt to current guideline
>+- fix gcc 4.7.x build problems
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.10-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 819851: 582968 | 624214 | 624870