Accepting request 198443 from Java:packages

- use add_maven_depmap from javapackages-tools

- Move from jpackage-utils to javapackage-tools

OBS-URL: https://build.opensuse.org/request/show/198443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/werken-xpath?expand=0&rev=11

werken-xpath.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 11 08:55:10 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
+-------------------------------------------------------------------
+Mon Sep  9 11:06:26 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
 -------------------------------------------------------------------
 Mon Oct 22 08:01:14 UTC 2012 - cfarrell@suse.com
 

werken-xpath.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package werken-xpath (Version 0.9.4)
+# spec file for package werken-xpath
 #
-# Copyright (c) 2009 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
@@ -17,13 +17,13 @@
 
 
 %define dotname werken.xpath
-%define section free
 
 Name:           werken-xpath
 Version:        0.9.4
-Release:        2
+Release:        0
 Summary:        XPath implementation using JDOM
 License:        Apache-1.1
+Group:          Development/Libraries/Java
 Source0:        %{dotname}-%{version}-beta-src.tar.bz2
 Source1:        %{name}-%{version}.pom
 Patch0:         %{name}-ElementNamespaceContext.patch
@@ -39,17 +39,16 @@ Url:            http://sourceforge.net/projects/werken-xpath/
 Requires:       jdom
 BuildRequires:  ant >= 1.6
 BuildRequires:  antlr
+BuildRequires:  javapackages-tools
 BuildRequires:  jdom
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
-BuildRequires:  jpackage-utils >= 1.7.2
-Group:          Development/Libraries/Java
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       werken.xpath = %{version}-%{release}
 Obsoletes:      werken.xpath <= 0.9.4
-Requires(post):    jpackage-utils >= 1.7.2
-Requires(postun):  jpackage-utils >= 1.7.2
+Requires(post):    javapackages-tools
+Requires(postun):  javapackages-tools
 
 %description
 werken.xpath is an implementation of the W3C XPath Recommendation, on
@@ -60,12 +59,9 @@ as-yet-unreleased werken.xslt (eXtensible Stylesheet Language) and the
 werken.canonical (XML canonicalization) packages.
 
 %package        javadoc
-License:        Apache-1.1
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation/HTML
 BuildRequires:  java-javadoc
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 Provides:       werken.xpath-javadoc = %{version}-%{release}
 Obsoletes:      werken.xpath-javadoc <= 0.9.4
 
@@ -109,37 +105,26 @@ sh runtests.sh
 %install
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{dotname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done
-ln -sf %{name}.jar %{dotname}.jar)
+cp -p build/%{dotname}.jar $RPM_BUILD_ROOT%{_javadir}/%{dotname}.jar
+(cd $RPM_BUILD_ROOT%{_javadir}; ln -sf %{dotname}.jar %{name}.jar)
 # pom
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms/JPP-werken-xpath.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-werken-xpath.pom
+%add_maven_depmap
+
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %doc INSTALL LICENSE LIMITATIONS README TODO
 %{_javadir}/*
-%{_datadir}/maven2/default_poms/*
-%config %{_mavendepmapfragdir}
-%dir %{_datadir}/maven2
-%dir %{_datadir}/maven2/default_poms
+%{_mavenpomdir}/*
+%config %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog