Hello community, here is the log from the commit of package libjnidispatch for openSUSE:Factory checked in at 2014-07-11 20:05:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old) and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch" Changes: -------- --- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes 2013-12-18 12:32:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes 2014-07-11 20:05:57.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:50:16 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-trax and run spec-cleaner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjnidispatch.spec ++++++ --- /var/tmp/diff_new_pack.id1FwI/_old 2014-07-11 20:05:57.000000000 +0200 +++ /var/tmp/diff_new_pack.id1FwI/_new 2014-07-11 20:05:57.000000000 +0200 @@ -1,9 +1,8 @@ # # spec file for package libjnidispatch # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +18,12 @@ Name: libjnidispatch -Url: https://github.com/twall/jna Version: 3.4.0 Release: 0 - Summary: Java Native Access (shared library) License: LGPL-2.1+ Group: Development/Libraries/Java +Url: https://github.com/twall/jna #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 @@ -36,68 +34,21 @@ Patch0: jna-%{version}-build.patch Patch1: libffi-aarch64.patch Patch2: libffi-ppc64le.patch -%if 0%{?mdkversion} < 201100 -BuildArch: i586 x86_64 ppc ppc64 ppc64le aarch64 -%endif -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Requires: java >= 1.5.0 BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps -BuildRequires: ant-trax BuildRequires: java-devel >= 1.5.0 BuildRequires: javapackages-tools -# 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 - +Requires: java >= 1.5.0 Provides: jna-native = %{version}-%{release} Obsoletes: jna-native < %{version}-%{release} -# centos does not know recommends -%if ! 0%{?centos_version} && ! 0%{?fedora} -Recommends: jna -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXt-devel %description Native library stub to dynamically invoke native code used by Java Native Access library. - %package -n jna Summary: Java Native Access Group: Development/Libraries/Java @@ -124,7 +75,6 @@ BuildArch: noarch %description -n jna-javadoc - %{summary}. %prep @@ -140,38 +90,33 @@ %build -%{ant} \ +ant \ jar \ native \ platform-jar \ -Dcflags_extra.native="%{optflags}" \ javadoc -# compile-tests \ -# test \ -# with correct soname one test fails, TODO - %install - if [ -d build-d64 ]; then suffix="-d64" fi -install -d -m 755 $RPM_BUILD_ROOT%{_libdir} -install -p -m 644 build${suffix}/native/libjnidispatch.so $RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so +install -d -m 755 %{buildroot}%{_libdir} +install -p -m 644 build${suffix}/native/libjnidispatch.so %{buildroot}%{_libdir}/libjnidispatch.so -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 build${suffix}/jna.jar $RPM_BUILD_ROOT%{_javadir}/jna.jar -install -p -m 644 ./contrib/platform/dist/platform.jar $RPM_BUILD_ROOT%{_javadir}/platform.jar +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 build${suffix}/jna.jar %{buildroot}%{_javadir}/jna.jar +install -p -m 644 ./contrib/platform/dist/platform.jar %{buildroot}%{_javadir}/platform.jar -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -d -m 755 %{buildroot}%{_mavenpomdir} # let's name maven fragment jna as expected -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-jna.pom +install -p -m 644 %{SOURCE1} %{buildroot}/%{_mavenpomdir}/JPP-jna.pom %add_maven_depmap JPP-jna.pom jna.jar -mv $RPM_BUILD_ROOT/%{_mavendepmapfragdir}/%{name} $RPM_BUILD_ROOT/%{_mavendepmapfragdir}/jna +mv %{buildroot}/%{_mavendepmapfragdir}/%{name} %{buildroot}/%{_mavendepmapfragdir}/jna -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/jna -cp -pr doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/jna +install -d -m 755 %{buildroot}%{_javadocdir}/jna +cp -pr doc/javadoc/* %{buildroot}%{_javadocdir}/jna %files %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
