Hello community,
here is the log from the commit of package libjnidispatch for openSUSE:Factory
checked in at 2012-11-15 09:42:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old)
and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes
2012-06-26 16:08:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes
2012-11-15 09:42:31.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 14 13:10:40 UTC 2012 - mvysko...@suse.com
+
+- fix a build for non-suse distros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjnidispatch.spec ++++++
--- /var/tmp/diff_new_pack.85IDCP/_old 2012-11-15 09:42:32.000000000 +0100
+++ /var/tmp/diff_new_pack.85IDCP/_new 2012-11-15 09:42:32.000000000 +0100
@@ -34,6 +34,9 @@
Source0: jna-%{version}-suse.tar.bz2
Source1: jna-%{version}.pom
Patch0: jna-%{version}-build.patch
+%if 0%{?mdkversion} < 201100
+BuildArch: i586 x86_64
+%endif
Requires(post): jpackage-utils >= 1.7.5
Requires(postun): jpackage-utils >= 1.7.5
Requires: java >= 1.5.0
@@ -43,14 +46,50 @@
BuildRequires: ant-trax
BuildRequires: java-devel >= 1.5.0
BuildRequires: jpackage-utils >= 1.7.5
+# ant variable
+%if ! 0%{?suse_version}
+%define ant JAVA_HOME=/usr/lib/jvm/java ant
+%endif
+# libx differences
+%if 0%{?centos_version} || 0%{?fedora}
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+%endif
+%if 0%{?centos_version} > 505 || 0%{?fedora}
+BuildRequires: java-devel >= 1.6.0
+%endif
+%if 0%{?centos_version} > 505
+BuildRequires: saxon
+%endif
+%if 0%{?mandriva_version}
+%ifarch x86_64
+%define _lib lib64
+%else
+%define _lib lib
+%endif
+%if 0%{?mdkversion} > 201010
+BuildRequires: %{_lib}x11-devel
+%else
+BuildRequires: %{_lib}x11_6-devel
+%endif
+%if 0%{?mdkversion} >= 201010
+BuildRequires: %{_lib}xt-devel
+%else
+BuildRequires: %{_lib}xt6-devel
+%endif
+%endif
+%if 0%{?suse_version}
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXt-devel
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: jna-native = %{version}-%{release}
Obsoletes: jna-native < %{version}-%{release}
-
+# centos does not know recommends
+%if ! 0%{?centos_version} && ! 0%{?fedora}
Recommends: jna
+%endif
%description
Native library stub to dynamically invoke native code used by Java Native
@@ -149,6 +188,9 @@
%doc CHANGES.md LICENSE OTHERS README.md TODO
%{_javadir}/jna.jar
%{_javadir}/platform.jar
+%dir %{_mavendepmapfragdir}
+%dir %{_datadir}/maven2
+%dir %{_datadir}/maven2/poms
%{_datadir}/maven2/poms/JPP-jna.pom
%{_mavendepmapfragdir}/jna
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
