[jaffl/f14/master] Initial import (#561462).
Mohammed Morsi
mmorsi at fedoraproject.org
Tue Nov 9 15:04:38 UTC 2010
commit 3bab00c30b809c837936e4833b87e508c37ce05d
Author: Mohammed Morsi <mmorsi at redhat.com>
Date: Tue Nov 9 10:01:35 2010 -0500
Initial import (#561462).
.gitignore | 1 +
jaffl.spec | 117 ++++++++++++++++++++++++++++++++++++++
jaffl_fix_jar_dependencies.patch | 65 +++++++++++++++++++++
jaffl_remove_invokedynamic.patch | 13 ++++
sources | 1 +
5 files changed, 197 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..17f1db2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wmeissner-jaffl-58c69c9.tar.gz
diff --git a/jaffl.spec b/jaffl.spec
new file mode 100644
index 0000000..5d80628
--- /dev/null
+++ b/jaffl.spec
@@ -0,0 +1,117 @@
+%global git_commit 58c69c9
+%global cluster wmeissner
+
+Name: jaffl
+Version: 0.5.4
+Release: 4%{?dist}
+Summary: Java Abstracted Foreign Function Layer
+Group: System Environment/Libraries
+License: LGPLv3
+URL: http://github.com/%{cluster}/%{name}
+Source0: %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
+Patch0: jaffl_fix_jar_dependencies.patch
+
+# invokedynamic is a Java 7 feature and the method
+# which needs it is only defined and not used
+Patch1: jaffl_remove_invokedynamic.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: ant
+BuildRequires: ant-nodeps
+BuildRequires: jffi
+BuildRequires: jnr-x86asm
+BuildRequires: objectweb-asm
+
+Requires: java
+Requires: jpackage-utils
+Requires: jffi
+Requires: jnr-x86asm
+Requires: objectweb-asm
+BuildArch: noarch
+
+%description
+An abstracted interface to invoking native functions from java
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{cluster}-%{name}-%{git_commit}
+%patch0 -p0
+%patch1 -p0
+
+# remove all builtin jars
+find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+
+# remove tests/junit dependency
+rm -rf test/
+
+mkdir build_lib
+build-jar-repository -s -p build_lib jffi jnr-x86asm objectweb-asm/asm \
+ objectweb-asm/analysis objectweb-asm/commons \
+ objectweb-asm/tree objectweb-asm/util objectweb-asm/xml
+
+%build
+ant
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+cp dist/%{name}-0.5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+cp -rp dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{_javadocdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# pom
+%add_to_maven_depmap org.jruby.extras %{name} %{version} JPP %{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jaffl.pom
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/*
+%doc LICENSE
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+
+%changelog
+* Fri Oct 29 2010 Mohammed Morsi <mmorsi at redhat.com> - 0.5.4-4
+- license fix, include pom.xml, install javadocs correctly
+
+* Tue Oct 26 2010 Mohammed Morsi <mmorsi at redhat.com> - 0.5.4-3
+- change to patch0 to remove class-path-in-manifest rpmlint error
+
+* Thu Sep 16 2010 Matěj Cepl <mcepl at redhat.com> - 0.5.4-2
+- Make the package noarch
+
+* Thu Sep 09 2010 <mmorsi at redhat.com> - 0.5.4-1
+- bumped version to 0.5.4
+- added jaffl_remove_invokedynamic.patch
+
+* Thu Jan 28 2009 <mmorsi at redhat.com> - 0.3.4-1
+- Initial build.
diff --git a/jaffl_fix_jar_dependencies.patch b/jaffl_fix_jar_dependencies.patch
new file mode 100644
index 0000000..1bbf6bf
--- /dev/null
+++ b/jaffl_fix_jar_dependencies.patch
@@ -0,0 +1,65 @@
+--- nbproject/project.properties.orig 2010-09-09 14:27:19.000000000 -0400
++++ nbproject/project.properties 2010-09-09 14:30:43.000000000 -0400
+@@ -20,13 +20,13 @@ dist.jar=${dist.dir}/jaffl-0.5.jar
+ dist.javadoc.dir=${dist.dir}/javadoc
+ endorsed.classpath=
+ excludes=
+-file.reference.asm-3.2.jar=lib/asm-3.2.jar
+-file.reference.asm-analysis-3.2.jar=lib/asm-analysis-3.2.jar
+-file.reference.asm-commons-3.2.jar=lib/asm-commons-3.2.jar
+-file.reference.asm-tree-3.2.jar=lib/asm-tree-3.2.jar
+-file.reference.asm-util-3.2.jar=lib/asm-util-3.2.jar
+-file.reference.asm-xml-3.2.jar=lib/asm-xml-3.2.jar
+-file.reference.jffi-complete.jar-1=../jffi.git/dist/jffi-complete.jar
++file.reference.asm-3.2.jar=build_lib/objectweb-asm_asm.jar
++file.reference.asm-analysis-3.2.jar=build_lib/objectweb-asm_analysisasm-analysis.jar
++file.reference.asm-commons-3.2.jar=build_lib/objectweb-asm_commonsasm.jar
++file.reference.asm-tree-3.2.jar=build_lib/objectweb-asm_treeasm.jar
++file.reference.asm-util-3.2.jar=build_lib/objectweb-asm_utilasm.jar
++file.reference.asm-xml-3.2.jar=build_lib/objectweb-asm_xmlasm-xml.jar
++file.reference.jffi-complete.jar=build_lib/jffi.jar
+ includes=**
+ jar.compress=true
+ javac.classpath=\
+@@ -70,8 +70,8 @@ meta.inf.dir=${src.dir}/META-INF
+ platform.active=default_platform
+ project.jffi=../jffi.git
+ project.jnr-x86asm=../jnr-x86asm
+-reference.jffi.jar=${project.jffi}/dist/jffi.jar
+-reference.jnr-x86asm.jar=${project.jnr-x86asm}/dist/jnr-x86asm.jar
++reference.jffi.jar=build_lib/jffi.jar
++reference.jnr-x86asm.jar=build_lib/jnr-x86asm.jar
+ run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+--- nbproject/build-impl.xml.orig 2010-10-26 12:08:36.000000000 -0400
++++ nbproject/build-impl.xml 2010-10-26 12:12:06.000000000 -0400
+@@ -411,20 +411,6 @@ is divided into following sections:
+ <propertyfile file="${built-jar.properties}">
+ <entry key="${basedir}" value=""/>
+ </propertyfile>
+- <antcall target="-maybe-call-dep">
+- <param name="call.built.properties" value="${built-jar.properties}"/>
+- <param location="${project.jffi}" name="call.subproject"/>
+- <param location="${project.jffi}/build.xml" name="call.script"/>
+- <param name="call.target" value="jar"/>
+- <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+- </antcall>
+- <antcall target="-maybe-call-dep">
+- <param name="call.built.properties" value="${built-jar.properties}"/>
+- <param location="${project.jnr-x86asm}" name="call.subproject"/>
+- <param location="${project.jnr-x86asm}/build.xml" name="call.script"/>
+- <param name="call.target" value="jar"/>
+- <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+- </antcall>
+ </target>
+ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+ <target depends="init" name="-check-automatic-build">
+@@ -570,7 +556,6 @@ is divided into following sections:
+ <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <fileset dir="${build.classes.dir}"/>
+ <manifest>
+- <attribute name="Class-Path" value="${jar.classpath}"/>
+ </manifest>
+ </copylibs>
+ </target>
diff --git a/jaffl_remove_invokedynamic.patch b/jaffl_remove_invokedynamic.patch
new file mode 100644
index 0000000..bfc10f2
--- /dev/null
+++ b/jaffl_remove_invokedynamic.patch
@@ -0,0 +1,13 @@
+--- src/com/kenai/jaffl/provider/jffi/SkinnyMethodAdapter.java.orig 2010-09-09 15:05:35.000000000 -0400
++++ src/com/kenai/jaffl/provider/jffi/SkinnyMethodAdapter.java 2010-09-09 15:05:48.000000000 -0400
+@@ -190,10 +190,6 @@ public class SkinnyMethodAdapter impleme
+ getMethodVisitor().visitMethodInsn(INVOKEINTERFACE, p(recv), methodName, sig(returnType, parameterTypes));
+ }
+
+- public void invokedynamic(String arg1, String arg2, String arg3) {
+- getMethodVisitor().visitMethodInsn(INVOKEDYNAMIC, arg1, arg2, arg3);
+- }
+-
+ public void aprintln() {
+ dup();
+ getstatic(p(System.class), "out", ci(PrintStream.class));
diff --git a/sources b/sources
index e69de29..20fc3c8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+8e6471b4673845448800fcd98b72324a wmeissner-jaffl-58c69c9.tar.gz
More information about the scm-commits
mailing list