From 7682000907958c992db5f02fc12bf38ffb5f128a813403d8c0202df043fa43e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 18 Mar 2015 10:16:20 +0000
Subject: [PATCH] - Fix build with new jpackage-tools

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

diff --git a/tomcat.changes b/tomcat.changes
index b34e14c..f12f8d9 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 18 10:16:07 UTC 2015 - tchvatal@suse.com
+
+- Fix build with new jpackage-tools
+
 -------------------------------------------------------------------
 Wed Sep 17 11:28:46 UTC 2014 - bmaryniuk@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 135d713..748336c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -736,7 +736,7 @@ rm -f \
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
 %{_mavenpomdir}/JPP-%{name}-el-api.pom
-%{_mavendepmapfragdir}/%{name}-tomcat-el-api
+%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
 %{_javadir}/el_1_0_api.jar
 %{_javadir}/el_api.jar
 %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
@@ -753,14 +753,14 @@ rm -f \
 %{_javadir}/jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp.jar
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
+%{_datadir}/maven-metadata/{name}-tomcat-jsp-api.xml
 
 %files lib
 %defattr(-,root,root)
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
-%{_mavendepmapfragdir}/%{name}
+%{_datadir}/maven-metadata/%{name}.xml
 %{_mavenpomdir}/JPP.%{name}-annotations-api.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -796,7 +796,7 @@ rm -f \
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet.jar
-%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
+%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
 %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
 
 %files webapps