diff --git a/ant-antlr.spec b/ant-antlr.spec index 61b99fb..66f31ea 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -1,7 +1,7 @@ # # 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 # All rights reserved. # @@ -654,11 +654,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom -%config(noreplace) %{_mavendepmapfragdir}/* +%{_datadir}/maven-metadata/ant.xml %dir %{_mavenpomdir} %endif - %if %{with antlr} %files %defattr(0644,root,root,0755) @@ -666,7 +665,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%config %{_mavendepmapfragdir}/ant-antlr +%{_datadir}/maven-metadata/ant-antlr.xml %dir %{_mavenpomdir} %endif @@ -676,10 +675,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit -%config(noreplace) %{_mavendepmapfragdir}/ant-junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%{_datadir}/maven-metadata/ant-junit.xml %dir %{_mavenpomdir} %endif diff --git a/ant-junit.changes b/ant-junit.changes index f43102b..6882027 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -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 diff --git a/ant-junit.spec b/ant-junit.spec index 1f86cac..c736fb5 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -1,7 +1,7 @@ # # 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 # All rights reserved. # @@ -654,11 +654,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom -%config(noreplace) %{_mavendepmapfragdir}/* +%{_datadir}/maven-metadata/ant.xml %dir %{_mavenpomdir} %endif - %if %{with antlr} %files %defattr(0644,root,root,0755) @@ -666,7 +665,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%config %{_mavendepmapfragdir}/ant-antlr +%{_datadir}/maven-metadata/ant-antlr.xml %dir %{_mavenpomdir} %endif @@ -676,10 +675,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit -%config(noreplace) %{_mavendepmapfragdir}/ant-junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%{_datadir}/maven-metadata/ant-junit.xml %dir %{_mavenpomdir} %endif diff --git a/ant.changes b/ant.changes index f43102b..6882027 100644 --- a/ant.changes +++ b/ant.changes @@ -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 diff --git a/ant.spec b/ant.spec index a44562e..d0bd3c9 100644 --- a/ant.spec +++ b/ant.spec @@ -1,7 +1,7 @@ # # 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 # All rights reserved. # @@ -653,11 +653,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_mavenpomdir}/JPP-ant-launcher.pom %{_mavenpomdir}/JPP-ant-parent.pom %{_mavenpomdir}/JPP-ant.pom -%config(noreplace) %{_mavendepmapfragdir}/* +%{_datadir}/maven-metadata/ant.xml %dir %{_mavenpomdir} %endif - %if %{with antlr} %files %defattr(0644,root,root,0755) @@ -665,7 +664,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%config %{_mavendepmapfragdir}/ant-antlr +%{_datadir}/maven-metadata/ant-antlr.xml %dir %{_mavenpomdir} %endif @@ -675,10 +674,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit -%config(noreplace) %{_mavendepmapfragdir}/ant-junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom +%{_datadir}/maven-metadata/ant-junit.xml %dir %{_mavenpomdir} %endif