From 160727da65ec6981cb981a161ebe080209583cedf43a817a677ea801dc7dcef9 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar Date: Mon, 2 May 2016 21:59:46 +0000 Subject: [PATCH] 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