[jffi] Updated to version 1.2.6.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Tue Feb 5 07:19:47 UTC 2013
commit 2ef5d47a636f8af54896573421fe61c61ee15581
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Tue Feb 5 08:19:40 2013 +0100
Updated to version 1.2.6.
.gitignore | 1 +
fix_dependencies_in_build_xml.patch | 31 --------
fix_jar_dependencies.patch | 17 -----
jffi-add-built-jar-to-test-classpath.patch | 10 +++
...flags.patch => jffi-fix-compilation-flags.patch | 0
jffi-fix-dependencies-in-build-xml.patch | 12 +++
jffi.spec | 77 ++++++++++----------
sources | 2 +-
8 files changed, 61 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48318f8..fd07793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wmeissner-jffi-bbb81f1.tar.gz
/wmeissner-jffi-e0d10e9.tar.gz
/wmeissner-jffi-1.0.9-0-g893e964.tar.gz
/wmeissner-jffi-1.0.10-0-g5874d2a.tar.gz
+/jnr-jffi-1.2.6-0-g52af1f2.tar.gz
diff --git a/jffi-add-built-jar-to-test-classpath.patch b/jffi-add-built-jar-to-test-classpath.patch
new file mode 100644
index 0000000..bf0eba2
--- /dev/null
+++ b/jffi-add-built-jar-to-test-classpath.patch
@@ -0,0 +1,10 @@
+--- build.xml.orig 2012-11-23 14:48:13.000000000 +0100
++++ build.xml 2012-11-23 14:48:48.700882816 +0100
+@@ -162,6 +162,7 @@
+ <pathelement location="${build.classes.dir}"/>
+ <pathelement location="${build.test.dir}/classes"/>
+ <pathelement location="lib/junit_4/junit-4.5.jar"/>
++ <pathelement location="${complete.jar}"/>
+ </classpath>
+ <sysproperty key="java.library.path" value="${build.native.dir}"/>
+
diff --git a/fix_compilation_flags.patch b/jffi-fix-compilation-flags.patch
similarity index 100%
rename from fix_compilation_flags.patch
rename to jffi-fix-compilation-flags.patch
diff --git a/jffi-fix-dependencies-in-build-xml.patch b/jffi-fix-dependencies-in-build-xml.patch
new file mode 100644
index 0000000..1c091b2
--- /dev/null
+++ b/jffi-fix-dependencies-in-build-xml.patch
@@ -0,0 +1,12 @@
+--- build.xml.orig 2012-08-03 11:05:31.000000000 +0200
++++ build.xml 2012-09-04 15:44:40.372006559 +0200
+@@ -2,8 +2,7 @@
+ <project name="jffi" default="jar" basedir=".">
+ <description>Builds, tests, and runs the project jffi.</description>
+ <path id="classpath.test">
+- <pathelement location="lib/junit_4/junit-4.5.jar"/>
+- <pathelement location="lib/junit_4/junit-4.5-api.jar"/>
++ <pathelement location="lib/junit.jar"/>
+ </path>
+
+ <target name="clean" depends="-init">
diff --git a/jffi.spec b/jffi.spec
index bccadbc..fc899e9 100644
--- a/jffi.spec
+++ b/jffi.spec
@@ -1,43 +1,37 @@
-%global git_commit 5874d2a
-%global cluster wmeissner
+%global commit_hash 52af1f2
+%global tag_hash f2d7914
+%global sofile_version 1.2
Name: jffi
-Version: 1.0.10
-Release: 4%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
Summary: An optimized Java interface to libffi
Group: System Environment/Libraries
-License: LGPLv3
-URL: http://github.com/%{cluster}/%{name}
-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
-Patch2: fix_compilation_flags.patch
-
-BuildRequires: java-devel >= 1:1.6.0
+License: LGPLv3+ or ASL 2.0
+URL: http://github.com/jnr/%{name}/
+Source0: https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+Patch0: jffi-fix-dependencies-in-build-xml.patch
+Patch1: jffi-add-built-jar-to-test-classpath.patch
+Patch2: jffi-fix-compilation-flags.patch
+
+BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: libffi-devel
+
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: ant-junit
BuildRequires: junit4
-Requires: java >= 1:1.6.0
+
+Requires: java
Requires: jpackage-utils
%description
An optimized Java interface to libffi
-%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}
+%setup -q -n jnr-%{name}-%{tag_hash}
%patch0
%patch1
%patch2
@@ -53,40 +47,43 @@ rm -rf test/
chmod 0644 jni/jffi/jffi.h
# remove uneccessary directories
-rm -rf archive/ jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*
+rm -rf archive/* jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*
find ./ -name '*.jar' -exec rm -f '{}' \;
find ./ -name '*.class' -exec rm -f '{}' \;
%build
-mkdir lib/build_lib
-build-jar-repository -s -p lib/build_lib junit junit4
+build-jar-repository -s -p lib/ junit
-ant
+ant -Duse.system.libffi=1
%install
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_jnidir}
+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
+cp -p dist/%{name}-complete.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/jffi
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%check
-ant test
+# don't fail on unused parameters... (TODO: send patch upstream)
+sed -i 's|-Werror||' libtest/GNUmakefile
+ant -Duse.system.libffi=1 test
%files
-%{_libdir}/%{name}/
-%{_jnidir}/*
-
-%files javadoc
-%{_javadocdir}/jffi
+%doc COPYING.GPL COPYING.LESSER LICENSE
+%{_jnidir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%changelog
+* Tue Feb 05 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.2.6-1
+- Updated to version 1.2.6.
+
* Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.10-4
- revbump after jnidir change
diff --git a/sources b/sources
index b76c297..1a19a38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52879e48e76214df94704da1ec31ee1e wmeissner-jffi-1.0.10-0-g5874d2a.tar.gz
+7e9a2e7b8fa55c247832a22a088bce32 jnr-jffi-1.2.6-0-g52af1f2.tar.gz
More information about the scm-commits
mailing list