[jhighlight] Use new mvn_* macros to generate metadata

[Gerard Ryan]

commit 20229e40d3b4baa9ec1cf597c90ad8230830cc99
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Tue Jul 1 20:31:55 2014 +0100

    Use new mvn_* macros to generate metadata

 jhighlight.spec |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/jhighlight.spec b/jhighlight.spec
index e3ab142..bf47199 100644
--- a/jhighlight.spec
+++ b/jhighlight.spec
@@ -1,6 +1,6 @@
 Name:           jhighlight
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An embeddable pure Java syntax highlighting library
 
 Group:          Development/Libraries
@@ -19,6 +19,7 @@ BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  jflex
 BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-local
 BuildRequires:  tomcat-servlet-3.0-api
 
 Requires:       java-headless
@@ -54,35 +55,34 @@ popd
 
 sed -i -e "s/JFlex.anttask.JFlexTask/jflex.anttask.JFlexTask/" build.xml
 
+cp %{SOURCE1} %{name}.pom
+%mvn_file com.uwyn:jhighlight %{name}
+
 %build
 ant
 
-%install
-
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_artifact %{name}.pom build/dist/%{name}-%{version}.jar
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-unzip build/dist/%{name}-javadocs-%{version}.zip -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%install
+mkdir javadoc
+unzip build/dist/%{name}-javadocs-%{version}.zip -d javadoc
 
-# POM
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install -J javadoc
 
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
+%files -f .mfiles
 %doc README
 %doc COPYING
 %doc LICENSE_LGPL.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE_LGPL.txt
 %doc COPYING
 
 
 %changelog
+* Tue Jul 01 2014 Gerard Ryan <galileo at fedoraproject.org> - 1.0-9
+- Use new mvn_* macros to generate metadata
+
 * Mon Jun 09 2014 Gerard Ryan <galileo at fedoraproject.org> - 1.0-8
 - RHBZ-1106948: FTBFS in rawhide (mass rebuild)