From c76ea4f408f36a20fc54225cc12a425de96009c6f68d5fca87032ad14697ae5d Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Tue, 10 Sep 2013 11:19:59 +0000
Subject: [PATCH] - use add_maven_depmap from javapackages-tools - don't
 install versioned jars and javadocs

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=12
---
 jsr-305.changes |  6 ++++++
 jsr-305.spec    | 31 ++++++++-----------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/jsr-305.changes b/jsr-305.changes
index 45384f0..e1e088c 100644
--- a/jsr-305.changes
+++ b/jsr-305.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 10 09:58:16 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+- don't install versioned jars and javadocs
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:06 UTC 2013 - tchvatal@suse.com
 
diff --git a/jsr-305.spec b/jsr-305.spec
index 98a754d..7d84846 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -74,43 +74,28 @@ popd
 %install
 # jars
 %{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
+%{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar
 
 # poms
-%add_to_maven_depmap org.jsr-305 %{name} %{version} JPP %{name}
-
-%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
-%{__cp} -a ri/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
+%{__mkdir_p} %{buildroot}%{_mavenpomdir}
+%{__cp} -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 # javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %doc license
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%{_javadir}/jsr305-%{version}.jar
 %{_javadir}/jsr305.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog