Attachment 624214 Details for Bug 819851 – add maven pom -rebase

[patch] add maven pom -rebase

0001-add-maven-pom.patch (text/plain), 4.74 KB, created by gil cattaneo on 2012-10-09 18:04:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-09 18:04:39 UTC

Size: 4.74 KB

patch

obsolete

>From 621514c1da3059b5fbefaac380e688a7f40a7346 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 9 Oct 2012 20:03:39 +0200
>Subject: [PATCH] add maven pom
>
>---
> jffi-1.0.10-pom.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
> jffi.spec             |   37 ++++++++++++++++++++++++++-----------
> 2 files changed, 68 insertions(+), 11 deletions(-)
> create mode 100644 jffi-1.0.10-pom.patch
>
>diff --git a/jffi-1.0.10-pom.patch b/jffi-1.0.10-pom.patch
>new file mode 100644
>index 0000000..186e181
>--- /dev/null
>+++ b/jffi-1.0.10-pom.patch
>@@ -0,0 +1,42 @@
>+--- pom.xml	2012-02-02 13:49:48.466906519 +0100
>++++ pom.xml-gil	2012-02-02 13:50:00.574906363 +0100
>+@@ -139,7 +139,7 @@
>+         </executions>
>+       </plugin>
>+ -->
>+-    <plugin>
>++    
>+-            <phase>package</phase> 
>++            <id>native-assemble</id>  this is used for inheritance merges 
>++            <phase>package</phase>  append to the packaging phase.
>+             <goals>
>+-              <goal>single</goal> 
>++              <goal>single</goal>  goals == mojos 
>+             </goals>
>+           </execution>
>+         </executions>
>+-      </plugin>
>++      </plugin-->
>+     </plugins>
>+-    <extensions>
>++    
>+   </build>
>+   <reporting>
>+     <outputDirectory>build/report</outputDirectory>
>diff --git a/jffi.spec b/jffi.spec
>index a85e5a9..c849827 100644
>--- a/jffi.spec
>+++ b/jffi.spec
>@@ -3,7 +3,7 @@
> 
> Name:    jffi
> Version: 1.0.10
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: An optimized Java interface to libffi 
> 
> Group:   System Environment/Libraries
>@@ -13,6 +13,9 @@ Source0: https://download.github.com/%{cluster}-%{name}-%{version}-0-g%{git_comm
> Patch0:  fix_dependencies_in_build_xml.patch
> Patch1:  fix_jar_dependencies.patch
> Patch2:  fix_compilation_flags.patch
>+# remove wagon-svn wagon-webdav extensions
>+# remove maven-antrun-plugin
>+Patch3:  %{name}-%{version}-pom.patch
> 
> BuildRequires: java-devel >= 1:1.6.0
> BuildRequires: jpackage-utils
>@@ -41,6 +44,7 @@ This package contains the API documentation for %{name}.
> %patch0
> %patch1
> %patch2
>+%patch3 -p0
> 
> # ppc{,64} fix
> # https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9
>@@ -55,8 +59,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 +69,19 @@ 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}
>+mkdir -p %{buildroot}%{_libdir}/%{name}
>+mkdir -p %{buildroot}%{_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
>+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 +89,19 @@ ant test
> %files
> %{_libdir}/%{name}/
> %{_jnidir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+%doc COPYING.* LICENSE
> 
> %files javadoc
> %{_javadocdir}/jffi
>+%doc COPYING.* LICENSE
> 
> %changelog
>+* Tue Oct 09 2012 gil cattaneo <puntogil@libero.it> - 1.0.10-4
>+- add maven pom
>+- adapt to current guideline
>+
> * 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