pool/tomcat
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix maven fragments paths to build in multiple distribution

Browse Source 
versions

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=91
This commit is contained in:
Duncan Mac-Vicar 2016-05-02 16:07:21 +00:00 committed by Git OBS Bridge
parent 2445018907
commit 078160fe69
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tomcat.changes
View File

@ -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 Thu Apr 21 21:22:56 UTC 2016 - jcnengel@gmail.com

17
tomcat.spec
View File

@ -726,7 +726,11 @@ 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
%{_mavendepmapfragdir}/%{name}-tomcat-el-api
%else
%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
%endif
%{_javadir}/el_1_0_api.jar %{_javadir}/el_1_0_api.jar
%{_javadir}/el_api.jar %{_javadir}/el_api.jar
%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
@ -743,14 +747,21 @@ 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
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
%else
%{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml %{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
%endif
%files lib %files lib
%defattr(-,root,root) %defattr(-,root,root)
%{libdir} %{libdir}
%dir %{bindir} %dir %{bindir}
%{bindir}/tomcat-juli.jar %{bindir}/tomcat-juli.jar
%if %suse_version < 1330
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml %{_datadir}/maven-metadata/%{name}.xml
%endif
%{_mavenpomdir}/JPP.%{name}-annotations-api.pom %{_mavenpomdir}/JPP.%{name}-annotations-api.pom
%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@ -786,7 +797,11 @@ 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
%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
%else
%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml %{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
%endif
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files webapps %files webapps