From 489e59e556fee6b63884e35d3687e502b7db41ef035c0130faf839f4b7e19402 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Wed, 11 Sep 2013 08:47:47 +0000
Subject: [PATCH] - use add_maven_depmap from javapackages-tools

OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=14
---
 velocity.changes |  5 +++++
 velocity.spec    | 29 +++++++++--------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/velocity.changes b/velocity.changes
index 5092d65..c7a8e98 100644
--- a/velocity.changes
+++ b/velocity.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 11 08:47:42 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:25 UTC 2013 - tchvatal@suse.com
 
diff --git a/velocity.spec b/velocity.spec
index 4564b0b..25c3d72 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -16,8 +16,6 @@
 #
 
 
-%define section free
-
 Name:           velocity
 Version:        1.5
 Release:        0
@@ -208,36 +206,27 @@ ant \
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%add_to_maven_depmap org.apache.velocity velocity %{version} JPP %{name}
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf docs/api
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
 %fdupes -s %{buildroot}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config %{_mavendepmapfragdir}
 
 %files manual
@@ -246,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %files demo
 %defattr(0644,root,root,0755)