SHA256
1
0
forked from pool/ant

- Fix build with new javapackages-tools

- Fix build with new javapackages-tools

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=62
This commit is contained in:
Tomáš Chvátal 2015-03-18 09:30:45 +00:00 committed by Git OBS Bridge
parent f6a22379bd
commit 832d3526bd
5 changed files with 22 additions and 15 deletions

View File

@ -1,7 +1,7 @@
# #
# spec file for package ant-antlr # spec file for package ant-antlr
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project # Copyright (c) 2000-2009, JPackage Project
# All rights reserved. # All rights reserved.
# #
@ -654,11 +654,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom %{_mavenpomdir}/JPP-ant.pom
%config(noreplace) %{_mavendepmapfragdir}/* %{_datadir}/maven-metadata/ant.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
@ -666,7 +665,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%config %{_mavendepmapfragdir}/ant-antlr %{_datadir}/maven-metadata/ant-antlr.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
@ -676,10 +675,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-junit*.jar %{_javadir}/ant/ant-junit*.jar
%{ant_home}/lib/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar
%config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl %{ant_home}/etc/junit-noframes.xsl
%{_mavenpomdir}/JPP.ant-ant-junit*.pom %{_mavenpomdir}/JPP.ant-ant-junit*.pom
%{_datadir}/maven-metadata/ant-junit.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 18 09:30:13 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 28 14:30:48 UTC 2014 - coolo@suse.com Thu Aug 28 14:30:48 UTC 2014 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ant-junit # spec file for package ant-junit
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project # Copyright (c) 2000-2009, JPackage Project
# All rights reserved. # All rights reserved.
# #
@ -654,11 +654,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom %{_mavenpomdir}/JPP-ant.pom
%config(noreplace) %{_mavendepmapfragdir}/* %{_datadir}/maven-metadata/ant.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
@ -666,7 +665,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%config %{_mavendepmapfragdir}/ant-antlr %{_datadir}/maven-metadata/ant-antlr.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
@ -676,10 +675,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-junit*.jar %{_javadir}/ant/ant-junit*.jar
%{ant_home}/lib/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar
%config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl %{ant_home}/etc/junit-noframes.xsl
%{_mavenpomdir}/JPP.ant-ant-junit*.pom %{_mavenpomdir}/JPP.ant-ant-junit*.pom
%{_datadir}/maven-metadata/ant-junit.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 18 09:30:13 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 28 14:30:48 UTC 2014 - coolo@suse.com Thu Aug 28 14:30:48 UTC 2014 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ant # spec file for package ant
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project # Copyright (c) 2000-2009, JPackage Project
# All rights reserved. # All rights reserved.
# #
@ -653,11 +653,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom %{_mavenpomdir}/JPP-ant.pom
%config(noreplace) %{_mavendepmapfragdir}/* %{_datadir}/maven-metadata/ant.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
@ -665,7 +664,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%config %{_mavendepmapfragdir}/ant-antlr %{_datadir}/maven-metadata/ant-antlr.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif
@ -675,10 +674,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-junit*.jar %{_javadir}/ant/ant-junit*.jar
%{ant_home}/lib/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar
%config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl %{ant_home}/etc/junit-noframes.xsl
%{_mavenpomdir}/JPP.ant-ant-junit*.pom %{_mavenpomdir}/JPP.ant-ant-junit*.pom
%{_datadir}/maven-metadata/ant-junit.xml
%dir %{_mavenpomdir} %dir %{_mavenpomdir}
%endif %endif