From 078160fe69d4ef126a288a9c6ebc20b111e4af84827c6e3b514848c3c876ba47 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar <dmacvicar@to-be-fixed.example.com>
Date: Mon, 2 May 2016 16:07:21 +0000
Subject: [PATCH 1/2] - fix maven fragments paths to build in multiple
 distribution   versions

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=91
---
 tomcat.changes |  6 ++++++
 tomcat.spec    | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/tomcat.changes b/tomcat.changes
index 4233b6e..623621c 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  2 16:05:26 UTC 2016 - dmacvicar@suse.de
+
+- fix maven fragments paths to build in multiple distribution
+  versions
+
 -------------------------------------------------------------------
 Thu Apr 21 21:22:56 UTC 2016 - jcnengel@gmail.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 8572397..b260386 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -726,7 +726,11 @@ rm -f \
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
 %{_mavenpomdir}/JPP-%{name}-el-api.pom
+%if %suse_version < 1330
+%{_mavendepmapfragdir}/%{name}-tomcat-el-api
+%else
 %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
+%endif
 %{_javadir}/el_1_0_api.jar
 %{_javadir}/el_api.jar
 %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
@@ -743,14 +747,21 @@ rm -f \
 %{_javadir}/jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp.jar
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
+%if %suse_version < 1330
+%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
+%else
 %{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
-
+%endif
 %files lib
 %defattr(-,root,root)
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
+%if %suse_version < 1330
+%{_mavendepmapfragdir}/%{name}
+%else
 %{_datadir}/maven-metadata/%{name}.xml
+%endif
 %{_mavenpomdir}/JPP.%{name}-annotations-api.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
 %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -786,7 +797,11 @@ rm -f \
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet.jar
+%if %suse_version < 1330
+%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
+%else
 %{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
+%endif
 %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
 
 %files webapps

From 160727da65ec6981cb981a161ebe080209583cedf43a817a677ea801dc7dcef9 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar <dmacvicar@to-be-fixed.example.com>
Date: Mon, 2 May 2016 21:59:46 +0000
Subject: [PATCH 2/2] SLE12 and SP1 have same suse_version but different maven
 behaviors

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=92
---
 tomcat.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index b260386..16f77d2 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -726,7 +726,7 @@ rm -f \
 %{_javadir}/%{name}-el-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
 %{_mavenpomdir}/JPP-%{name}-el-api.pom
-%if %suse_version < 1330
+%if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-el-api
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
@@ -747,7 +747,7 @@ rm -f \
 %{_javadir}/jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp.jar
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%if %suse_version < 1330
+%if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
@@ -757,7 +757,7 @@ rm -f \
 %{libdir}
 %dir %{bindir}
 %{bindir}/tomcat-juli.jar
-%if %suse_version < 1330
+%if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}
 %else
 %{_datadir}/maven-metadata/%{name}.xml
@@ -797,7 +797,7 @@ rm -f \
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet.jar
-%if %suse_version < 1330
+%if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml