From f9b054d772b0c5dc9c8f1b5dc0848bf594e1b224 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 16 Jan 2018 16:04:18 +0100
Subject: [PATCH] Install with XMvn

---
 xmlgraphics-commons.spec | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index f91f4c5..e29387f 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -16,9 +16,7 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
 BuildRequires:  apache-commons-io >= 1.3.1
 BuildRequires:  apache-commons-logging >= 1.0.4
-Requires:       java
-Requires:       apache-commons-io >= 1.3.1
-Requires:       apache-commons-logging >= 1.0.4
+BuildRequires:  apache-parent
 
 %description
 Apache XML Graphics Commons is a library that consists of
@@ -54,23 +52,23 @@ popd
 ant package javadocs
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_file : %{name}
+%mvn_artifact %{name}.pom build/%{name}-%{version}.jar
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install -J build/javadocs
 
 %files -f .mfiles
-%doc LICENSE NOTICE README
+%license LICENSE NOTICE
+%doc README
 
-%files javadoc
-%doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
 
 
 %changelog
+* Tue Jan 16 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0.1-5
+- Install with XMvn
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild