From 13f7ff85f7c49fb002fc139da6f26bdfb9078632 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 3 Jul 2017 14:43:23 +0200
Subject: [PATCH] Install with XMvn

---
 jna.spec | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/jna.spec b/jna.spec
index 1acc31f..e20eb8e 100644
--- a/jna.spec
+++ b/jna.spec
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java access to native libraries
 # Most of code is dual-licensed under either LGPL 2.1 only or Apache
 # License 2.0.  WeakIdentityHashMap.java was taken from Apache CXF,
@@ -28,8 +28,7 @@ Patch3:         0004-Fix-javadoc-build.patch
 Requires:       libffi
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-local
 BuildRequires:  libffi-devel
 BuildRequires:  ant
 BuildRequires:  ant-junit
@@ -94,27 +93,21 @@ ant -Dcompatibility=1.6 -Dplatform.compatibility=1.6 -Dcflags_extra.native="%{op
 find contrib -name build -exec rm -rf {} \; || :
 
 %install
-# jars
-install -D -m 644 build/%{name}-min.jar %{buildroot}%{_javadir}/%{name}.jar
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-find contrib -name '*.jar' -exec cp {} %{buildroot}%{_javadir}/%{name}/ \;
 # NOTE: JNA has highly custom code to look for native jars in this
 # directory.  Since this roughly matches the jpackage guidelines,
 # we'll leave it unchanged.
 install -d -m 755 %{buildroot}%{_libdir}/%{name}
 install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
 
-# install maven pom file
-install -Dm 644 pom-%{name}.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -Dm 644 pom-%{name}-platform.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-platform.pom
+%mvn_file :jna jna jna/jna
 
-# ... and maven depmap
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP.%{name}-%{name}-platform.pom -f platform %{name}/%{name}-platform.jar -a "net.java.dev.jna:platform"
+%mvn_package :jna-platform contrib
+%mvn_alias :jna-platform :platform
 
-# javadocs
-install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact pom-jna.xml build/jna-min.jar
+%mvn_artifact pom-jna-platform.xml contrib/platform/dist/jna-platform.jar
+
+%mvn_install -J doc/javadoc
 
 
 %files -f .mfiles
@@ -122,15 +115,16 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %license LICENSE LGPL2.1 AL2.0
 %{_libdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %license LICENSE LGPL2.1 AL2.0
-%{_javadocdir}/%{name}
 
-%files contrib -f .mfiles-platform
-%{_javadir}/%{name}
+%files contrib -f .mfiles-contrib
 
 
 %changelog
+* Mon Jul 03 2017 Michael Simacek <msimacek@redhat.com> - 4.4.0-2
+- Install with XMvn
+
 * Tue Mar 28 2017 Michael Simacek <msimacek@redhat.com> - 4.4.0-1
 - Update to upstream version 4.4.0