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
This commit is contained in:
Duncan Mac-Vicar 2016-05-02 21:59:46 +00:00 committed by Git OBS Bridge
parent 078160fe69
commit 160727da65

View File

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