From 3c2f5079d45d07ccd0d40a25aeb05d35a970f3e48f4ba94df9141b988dc54055 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Tue, 27 Aug 2013 11:58:24 +0000
Subject: [PATCH] - use new add_maven_depmap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-portlet-1_0-api?expand=0&rev=5
---
 apache-portlet-1_0-api.changes |  5 +++++
 apache-portlet-1_0-api.spec    | 35 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/apache-portlet-1_0-api.changes b/apache-portlet-1_0-api.changes
index 48f7e74..9ab71af 100644
--- a/apache-portlet-1_0-api.changes
+++ b/apache-portlet-1_0-api.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 27 11:58:10 UTC 2013 - mvyskocil@suse.com
+
+- use new add_maven_depmap 
+
 -------------------------------------------------------------------
 Sat Sep 17 11:12:25 UTC 2011 - jengelh@medozas.de
 
diff --git a/apache-portlet-1_0-api.spec b/apache-portlet-1_0-api.spec
index 7e1413d..bd9d65b 100644
--- a/apache-portlet-1_0-api.spec
+++ b/apache-portlet-1_0-api.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-portlet-1_0-api
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,24 +19,25 @@
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 %define with_maven 0
-%define base_name portlet-1.0-api
-%define section free
+%define short_name portlet
+%define base_name %{short_name}-1.0-api
 
 Name:           apache-portlet-1_0-api
 Version:        1.0
-Release:        85
+Release:        0
 Summary:        Portlet API 1.0 from Jetspeed2
 License:        Apache-2.0
-Url:            http://portals.apache.org/jetspeed-2/
 Group:          Development/Libraries/Java
+Url:            http://portals.apache.org/jetspeed-2/
 Source0:        apache-portlet-1.0-api.tar.gz
 # svn export http://svn.apache.org/repos/asf/portals/jetspeed-2/tags/JETSPEED-RELEASE-2.0/portlet-api/
 Source1:        apache-portlet-1.0-api-pom.xml
 Source2:        apache-portlet-1.0-api-LICENSE.TXT
 Source3:        apache-portlet-1.0-api-build.xml
-BuildRequires:  jpackage-utils >= 1.7.2
+BuildRequires:  ant >= 1.6
+BuildRequires:  ant-nodeps
 BuildRequires:  java-devel >= 1.4
-BuildRequires:  ant >= 1.6 ant-nodeps
+BuildRequires:  jpackage-utils >= 1.7.2
 %if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4-9
 BuildRequires:  maven2-plugin-compiler
@@ -59,7 +60,6 @@ Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 .
 
 
 %package javadoc
-License:        Apache-2.0
 Summary:        Portlet API 1.0 from Jetspeed2
 Group:          Development/Libraries/Java
 Requires(post):   /bin/rm,/bin/ln
@@ -93,12 +93,16 @@ ant jar javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 0644 target/portlet-api-1.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar %{base_name}-%{version}.jar)
-%add_to_maven_depmap javax.portlet portlet-api 1.0 JPP %{base_name}
+(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar portlet-api-%{version}.jar)
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} $(echo $jar | sed -e 's+-%{version}\.jar+.jar+'); done)
+
 #poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.portlet-api.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-portlet-api.pom
+%add_maven_depmap JPP-portlet-api.pom portlet-api.jar
+
+#javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* \
         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -106,20 +110,15 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE.TXT
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %defattr(0644,root,root,0755)
 %doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
 %dir %{_docdir}/%{name}-%{version}
 %{_javadir}/%{name}*.jar
 %{_javadir}/%{base_name}*.jar
-%{_datadir}/maven2
+%{_javadir}/portlet-api*.jar
 %{_mavendepmapfragdir}
+%{_mavenpomdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)