Hello community,
here is the log from the commit of package jna for openSUSE:Factory checked in
at 2012-02-15 15:57:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jna (Old)
and /work/SRC/openSUSE:Factory/.jna.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jna", Maintainer is "bnc-team-j...@forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/jna/jna.changes 2011-09-23 02:04:19.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.jna.new/jna.changes 2012-02-15
15:57:38.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Feb 9 13:53:29 UTC 2012 - mvysko...@suse.cz
+
+- Update to 3.4.0
+ * moved object creation out into pure Java code reduce JNI crossing
+ * add native peer value accessors for Pointer
+ * avoid loading any system-provided JNA via jna.nosys=true
+ * override default jnidispatch library name with jna.boot.library
+ * throw an error if JNA is not with a library
+ * linux/arm and linux/ppc 32-bit support
+ * preliminary linux/ppc64 support
+ * linux multi-arch support (kohsuke).
+ * add to `platform.unix.x11`: `XGrabKey`, `XUngrabKey`, `XSetErrorHandler`.
+ * and a lot of bugfixes (see /usr/share/packages/doc/jna/README.md)
+- fix bnc#745571 enable build of jna-native as well
+
+-------------------------------------------------------------------
Old:
----
gpl-2.0.txt
jna-3.1.0-build.patch
jna-3.1.0.pom
jna-3.1.0.tar.bz2
New:
----
jna-3.4.0-build.patch
jna-3.4.0-suse.tar.bz2
jna-3.4.0.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jna.spec ++++++
--- /var/tmp/diff_new_pack.w5L5zm/_old 2012-02-15 15:57:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w5L5zm/_new 2012-02-15 15:57:41.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package jna (Version 3.1.0)
+# spec file for package jna
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -23,36 +23,40 @@
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+%define with_native 1
%bcond_with native
%define section free
Name: jna
-Url: https://jna.dev.java.net/
-Group: Development/Libraries/Java
-Version: 3.1.0
-Release: 1
+Url: https://github.com/twall/jna
+Version: 3.4.0
+Release: 0
Summary: Java Native Access
License: LGPL-2.1+
-# svn -q export https://jna.dev.java.net/svn/jna/tags/3.1.0 jna-3.1.0
--username guest --password "" && tar cjf jna-3.1.0.tar.bz2 jna-3.1.0
-# tax -xf jna-3.0.3.tar.bz2
-# find jna-3.0.3/ -name '*.jar' | xargs rm -rf
-# tar -cjf jna-3.0.3-nojars.tar.bz2 jna-3.0.3/
-Source0: jna-3.1.0.tar.bz2
+Group: Development/Libraries/Java
+#wget https://github.com/twall/jna/tarball/3.4.0
+#tar -xf twall-jna-3.4.0-0-ge9da3c6.tar.bz2
+#find twall-jna-3e5b84f/ -name '*jar' | xargs rm
+#rm -rf twall-jna-3e5b84f/dist/
+#tar -cjf jna-3.4.0-suse.tar.bz2 twall-jna-3e5b84f/
+Source0: jna-3.4.0-suse.tar.bz2
Source1: %{name}-%{version}.pom
-Source2: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-Patch0: %{name}-%{version}-build.patch
+Patch0: jna-3.4.0-build.patch
Requires(post): jpackage-utils >= 1.7.5
Requires(postun): jpackage-utils >= 1.7.5
Requires: java >= 1.5.0
BuildRequires: ant
-BuildRequires: ant-nodeps
BuildRequires: ant-junit
+BuildRequires: ant-nodeps
BuildRequires: ant-trax
BuildRequires: java-devel >= 1.5.0
BuildRequires: jpackage-utils >= 1.7.5
-%if %without native
+%if %with native
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXt-devel
+%else
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,7 +82,6 @@
%if %with native
%package native
-License: LGPL-2.1+
Summary: Native shared library %{name}
Group: Development/Libraries/Java
@@ -88,51 +91,55 @@
%endif
%package javadoc
-License: LGPL-2.1+
Summary: Javadoc for %{name}
-Group: Development/HTML
+Group: Documentation/HTML
%description javadoc
%{summary}.
%prep
-%setup -q
+%setup -q -n twall-jna-3e5b84f
%patch0 -p1 -b .orig
-cp %{SOURCE2} .
+
+#FIXME: DirectTest fails
+rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java
%build
-export CLASSPATH=
-export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps,trax}`"
-cd jnalib
+
+%{ant} \
+ jar \
%if %with native
-%{ant} jar native compile-tests examples javadoc
-%else
-%{ant} jar compile-tests examples javadoc
+ native \
+ platform-jar \
%endif
+ compile-tests \
+ test \
+ javadoc
%install
-if [ -d jnalib/build-d64 ]; then
+if [ -d build-d64 ]; then
suffix="-d64"
fi
%if %with native
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -p -m 644 jnalib/build${suffix}/native/libjnidispatch.so
$RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so
+install -p -m 644 build${suffix}/native/libjnidispatch.so
$RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so
%endif
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 jnalib/build${suffix}/%{name}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -p -m 644 build${suffix}/%{name}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%if %with native
+install -p -m 644 ./contrib/platform/dist/platform.jar
$RPM_BUILD_ROOT%{_javadir}/platform.jar
+%endif
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
%add_to_maven_depmap com.sun.jna jna %{version} JPP %{name}
install -p -m 644 %{SOURCE1}
$RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr jnalib/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -145,15 +152,14 @@
%files
%defattr(0644,root,root,0755)
-%doc jnalib/release-notes.html jnalib/LICENSE.txt gpl-2.0.txt
-%{_javadir}/%{name}-%{version}.jar
+%doc CHANGES.md LICENSE OTHERS README.md TODO
%{_javadir}/%{name}.jar
+%{_javadir}/platform.jar
%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%if %with native
++++++ jna-3.1.0-build.patch -> jna-3.4.0-build.patch ++++++
--- /work/SRC/openSUSE:Factory/jna/jna-3.1.0-build.patch 2011-09-23
02:04:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jna.new/jna-3.4.0-build.patch 2012-02-15
15:57:38.000000000 +0100
@@ -1,6 +1,17 @@
---- jna-3.1.0/jnalib/build.xml.orig 2009-05-20 16:55:33.000000000 -0400
-+++ jna-3.1.0/jnalib/build.xml 2009-07-14 14:23:55.300153922 -0400
-@@ -195,7 +195,7 @@
+Index: twall-jna-3e5b84f/build.xml
+===================================================================
+--- twall-jna-3e5b84f.orig/build.xml 2011-11-26 14:17:49.000000000 +0100
++++ twall-jna-3e5b84f/build.xml 2012-02-09 14:26:19.040816213 +0100
+@@ -188,7 +188,7 @@
+ <target name="-setup" depends="-dynamic-properties">
+ <path id="compile-test.path">
+ <path id="test.libs">
+- <fileset dir="lib">
++ <fileset dir="/usr/share/java">
+ <include name="junit.jar"/>
+ </fileset>
+ <pathelement path="${classes}"/>
+@@ -228,7 +228,7 @@
</srcfiles>
</uptodate>
</target>
@@ -9,40 +20,30 @@
description="Build primary jar">
<jar jarfile="${build}/${jar}">
<manifest>
-@@ -214,7 +214,7 @@
- </fileset>
- </jar>
- </target>
-- <target name="examples" depends="jar,native">
-+ <target name="examples" depends="jar">
- <jar jarfile="${build}/examples.jar">
- <manifest>
- <attribute name="Class-Path" value="jna.jar"/>
-@@ -391,7 +391,7 @@
+@@ -470,7 +470,7 @@
</jar>
</target>
-- <target name="compile-tests" depends="compile,native"
-+ <target name="compile-tests" depends="compile"
- description="Compile all test code">
+- <target name="compile-tests" depends="compile,native,jar"
++ <target name="compile-tests" depends="compile,jar"
+ description="Compile all test code">
<javac classpathref="compile-test.path"
source="${test.compatibility}"
-@@ -459,7 +459,9 @@
- <report todir="${reports.junit}"/>
- </junitreport>
- <echo>View test report in file://${reports.junit}/index.html</echo>
-+<!--
- <fail if="testfailure" unless="clover">One or more tests failed</fail>
-+-->
- </target>
-
- <target name="with.clover" description="Enable code coverage for tests">
-@@ -519,7 +521,7 @@
+@@ -491,8 +491,6 @@
+ <mkdir dir="${build}/jws"/>
+ <copy todir="${build}/jws" file="${build}/${jar}"/>
+ <copy todir="${build}/jws" file="${build}/${testjar}"/>
+- <copy todir="${build}/jws" file="lib/junit.jar"/>
+- <copy todir="${build}/jws" file="lib/clover.jar"/>
+ <jar jarfile="${build}/jws/jnidispatch.jar">
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+ </jar>
+@@ -660,7 +658,7 @@
</javadoc>
</target>
-- <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-+ <target name="dist" depends="jar,compile-tests,examples,javadoc"
+- <target name="dist" depends="jar,contrib-jars,compile-tests,native,javadoc"
++ <target name="dist" depends="jar,contrib-jars,compile-tests,javadoc"
description="Build distribution files">
- <jar jarfile="${dist}/jna.jar" duplicate="preserve">
- <manifest>
+ <copy todir="${dist}">
+ <fileset dir="${build}">
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
