Hello community,
here is the log from the commit of package libjnidispatch for openSUSE:Factory checked in at 2018-11-01 14:40:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old)
and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch"
Thu Nov 1 14:40:36 2018 rev:23 rq:645755 version:4.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes 2018-07-27 10:58:19.473885673 +0200
+++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes 2018-11-01 14:40:40.914899854 +0100
@@ -1,0 +2,6 @@
+Wed Oct 24 14:23:37 UTC 2018 - Fridrich Strba
+
+- Install the provided pom*.xml files in order to make maven aware
+ about the jna-platform too
+
+-------------------------------------------------------------------
Old:
----
jna-4.5.1.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjnidispatch.spec ++++++
--- /var/tmp/diff_new_pack.Eo6jg8/_old 2018-11-01 14:40:44.358899511 +0100
+++ /var/tmp/diff_new_pack.Eo6jg8/_new 2018-11-01 14:40:44.358899511 +0100
@@ -13,12 +13,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define maven_xml %( [ -d %{_datadir}/maven-metadata ] && echo 1 )
-
Name: libjnidispatch
Version: 4.5.1
Release: 0
@@ -27,8 +25,7 @@
Group: Development/Libraries/Java
Url: https://github.com/twall/jna
Source0: https://github.com/twall/jna/archive/%{version}.tar.gz
-Source1: jna-4.5.1.pom
-Source2: libjnidispatch-rpmlintrc
+Source1000: libjnidispatch-rpmlintrc
Patch0: jna-build.patch
Patch1: jna-getpeer.patch
Patch2: jna-4.5.1-nojavah.patch
@@ -101,6 +98,7 @@
#rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java
sed -i 's|soname,\$@|soname,%{name}.so|' native/Makefile
+sed -i 's#<version>4.2.0</version>#<version>%{version}</version>#g' pom*.xml
%build
build-jar-repository -s -p lib ant
@@ -109,7 +107,7 @@
native \
platform-jar \
-Dcflags_extra.native="%{optflags}" \
- -Dbuild-native=true \
+ -Dbuild-native=true -Drelease \
-Dcompatibility=1.8 \
-Ddynlink.native=true \
javadoc
@@ -127,13 +125,14 @@
install -p -m 644 ./contrib/platform/dist/jna-platform.jar %{buildroot}%{_javadir}/jna-platform.jar
install -d -m 755 %{buildroot}%{_mavenpomdir}
-# let's name maven fragment jna as expected
-install -p -m 644 %{SOURCE1} %{buildroot}/%{_mavenpomdir}/JPP-jna.pom
-%add_maven_depmap JPP-jna.pom jna.jar
-%if 0%{?maven_xml}
-mv %{buildroot}%{_datadir}/maven-metadata/libjnidispatch.xml %{buildroot}%{_datadir}/maven-metadata/jna.xml
+install -p -m 644 pom-jna.xml %{buildroot}/%{_mavenpomdir}/jna.pom
+install -p -m 644 pom-jna-platform.xml %{buildroot}/%{_mavenpomdir}/jna-platform.pom
+%add_maven_depmap jna.pom jna.jar
+%add_maven_depmap jna-platform.pom jna-platform.jar -a net.java.dev.jna:platform
+%if %{defined _maven_repository}
+mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/jna
%else
-mv %{buildroot}%{_datadir}/maven-fragments/libjnidispatch %{buildroot}%{_datadir}/maven-fragments/jna
+mv %{buildroot}%{_datadir}/maven-metadata/%{name}.xml %{buildroot}%{_datadir}/maven-metadata/jna.xml
%endif
install -d -m 755 %{buildroot}%{_javadocdir}/jna
@@ -147,13 +146,12 @@
%files -n jna
%license LICENSE
%doc CHANGES.md OTHERS README.md TODO
-%{_javadir}/jna.jar
-%{_javadir}/jna-platform.jar
-%{_mavenpomdir}/JPP-jna.pom
-%if 0%{?maven_xml}
-%{_datadir}/maven-metadata/jna.xml
+%{_javadir}/*
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/jna
%else
-%{_datadir}/maven-fragments/jna
+%{_datadir}/maven-metadata/jna.xml*
%endif
%files -n jna-javadoc