Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2017-10-10 11:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Tue Oct 10 11:38:48 2017 rev:64 rq:531111 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2017-09-17 22:36:06.239422420 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2017-10-10 11:38:49.490431810 +0200 @@ -1,0 +2,12 @@ +Wed Oct 4 09:07:19 UTC 2017 - [email protected] + +- Remove dependency on java-1_5_0-gcj-compat-devel and build even + the bootstrap package with java source and target 1.6 + +------------------------------------------------------------------- +Fri Sep 29 07:06:59 UTC 2017 - [email protected] + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + +------------------------------------------------------------------- ant-junit.changes: same change ant.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.WMYnRu/_old 2017-10-10 11:38:50.570384410 +0200 +++ /var/tmp/diff_new_pack.WMYnRu/_new 2017-10-10 11:38:50.574384235 +0200 @@ -3,7 +3,6 @@ # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +17,12 @@ # +%global ant_home %{_datadir}/ant +%global major_version 1.9 ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### %bcond_with bootstrap %bcond_with junit %bcond_without antlr - -%global ant_home %{_datadir}/ant - -%global major_version 1.9 - Name: ant-antlr Version: 1.9.9 Release: 0 @@ -45,24 +41,18 @@ Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch Patch5: apache-ant-bootstrap.patch -%if %{with bootstrap} -BuildRequires: java-1_5_0-gcj-compat-devel -#BuildRequires: java-devel >= 1.5 -BuildConflicts: java-devel >= 1.9 -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless -%else -BuildRequires: java-devel >= 1.6.0 -%endif BuildRequires: antlr-bootstrap +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools +BuildRequires: unzip +BuildRequires: xml-commons-apis-bootstrap +#BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2-bootstrap +BuildArch: noarch # Needed for maven conversions %if !%{with bootstrap} BuildRequires: javapackages-local %endif -BuildRequires: unzip -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap -BuildRequires: xml-commons-apis-bootstrap %if %{with junit} || %{with antlr} BuildRequires: ant = %{version} BuildRequires: junit @@ -76,7 +66,7 @@ BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.5.0 +Requires: java-devel >= 1.6 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -98,9 +88,6 @@ Requires: junit4 %requires_eq ant %endif -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if %{with junit} %description Apache Ant is a Java-based build tool. @@ -154,14 +141,13 @@ %endif #if bootstrap %if %{with antlr} - %package -n ant-apache-bsf Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bsf Requires: bsf %requires_eq ant -BuildRequires: bsf %description -n ant-apache-bsf Apache Ant is a Java-based build tool. @@ -172,9 +158,9 @@ Summary: Optional apache resolver tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: xml-commons-resolver Requires: xml-commons-resolver %requires_eq ant -BuildRequires: xml-commons-resolver %description -n ant-apache-resolver Apache Ant is a Java-based build tool. @@ -185,9 +171,9 @@ Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-logging Requires: jakarta-commons-logging %requires_eq ant -BuildRequires: jakarta-commons-logging %description -n ant-commons-logging Apache Ant is a Java-based build tool. @@ -198,9 +184,9 @@ Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-net Requires: jakarta-commons-net %requires_eq ant -BuildRequires: jakarta-commons-net %description -n ant-commons-net Apache Ant is a Java-based build tool. @@ -211,9 +197,9 @@ Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bcel Requires: bcel %requires_eq ant -BuildRequires: bcel Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -226,9 +212,9 @@ Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: log4j-mini Requires: log4j %requires_eq ant -BuildRequires: log4j-mini Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -241,9 +227,9 @@ Summary: Optional apache oro tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: oro Requires: oro %requires_eq ant -BuildRequires: oro Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -256,9 +242,9 @@ Summary: Optional apache regexp tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: regexp Requires: regexp %requires_eq ant -BuildRequires: regexp Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -296,9 +282,9 @@ Summary: Optional jdepend tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jdepend Requires: jdepend %requires_eq ant -BuildRequires: jdepend %description -n ant-jdepend Apache Ant is a Java-based build tool. @@ -309,9 +295,9 @@ Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jsch Requires: jsch %requires_eq ant -BuildRequires: jsch %description -n ant-jsch Apache Ant is a Java-based build tool. @@ -351,9 +337,7 @@ %endif %patch1 %patch3 -p1 -%if ! %{with bootstrap} %patch4 -p1 -%endif %patch5 -p1 # clean jar files @@ -395,7 +379,7 @@ %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.5 -target 1.5" +export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" sh -x ./build.sh --noconfig jars %endif @@ -466,7 +450,7 @@ #install pom %if !%{with bootstrap} - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} + install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar %endif @@ -482,14 +466,14 @@ rm -f src/script/*.cmd # XSLs -cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc -rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl +cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir} +rm -f %{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %endif %if %{with junit} -cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with antlr} -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with bootstrap} @@ -535,7 +519,7 @@ %endif %if %{with bootstrap} -find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ +find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ -a ! -name coverage-frames.xsl \ @@ -547,9 +531,7 @@ %endif %if %{with bootstrap} - %files -%defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant @@ -559,15 +541,15 @@ %{_javadir}/%{name}-bootstrap.jar %dir %{_javadir}/%{name} %dir %{ant_home} -%dir %{ant_home}/etc +%dir %{ant_home}%{_sysconfdir} %{ant_home}/bin -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/coverage-frames.xsl -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl +%{ant_home}%{_sysconfdir}/ant-update.xsl +%{ant_home}%{_sysconfdir}/changelog.xsl +%{ant_home}%{_sysconfdir}/coverage-frames.xsl +%{ant_home}%{_sysconfdir}/mmetrics-frames.xsl +%{ant_home}%{_sysconfdir}/log.xsl +%{ant_home}%{_sysconfdir}/tagdiff.xsl +%{ant_home}%{_sysconfdir}/junit-frames-xalan1.xsl # % {ant_home}/etc/common2master.xsl # % {ant_home}/etc/printFailingTests.xsl %dir %{ant_home}/lib @@ -579,59 +561,55 @@ #%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant.pom -#%if %{?suse_version} > 1320 -#%{_datadir}/maven-metadata/ant.xml -#%else +#%if %{defined _maven_repository} #%config(noreplace) %{_mavendepmapfragdir}/ant +#%else +#%{_datadir}/maven-metadata/ant.xml #%endif #%dir %{_mavenpomdir} %endif + %if %{with antlr} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-antlr.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%else +%{_datadir}/maven-metadata/ant-antlr.xml %endif %dir %{_mavenpomdir} %endif %if %{with junit} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl +%{ant_home}%{_sysconfdir}/junit-frames.xsl +%{ant_home}%{_sysconfdir}/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-junit.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-junit +%else +%{_datadir}/maven-metadata/ant-junit.xml %endif %dir %{_mavenpomdir} %endif ### Basic ant subpackages %if %{with bootstrap} - %files -n ant-jmf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf #%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing @@ -645,9 +623,7 @@ %endif #if bootstrap %if %{with antlr} - %files -n ant-apache-bsf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bsf.jar %{ant_home}/lib/ant-apache-bsf.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bsf @@ -655,7 +631,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-resolver -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-resolver.jar %{ant_home}/lib/ant-apache-resolver.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-resolver @@ -663,7 +638,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-logging -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-logging.jar %{ant_home}/lib/ant-commons-logging.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-logging @@ -671,7 +645,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-net -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-net.jar %{ant_home}/lib/ant-commons-net.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-net @@ -679,7 +652,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-bcel -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel @@ -687,7 +659,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-log4j -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j @@ -695,16 +666,14 @@ %dir %{_mavenpomdir} %files -n ant-apache-oro -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-oro.jar %{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/etc/maudit-frames.xsl +%{ant_home}%{_sysconfdir}/maudit-frames.xsl %config(noreplace) %{_sysconfdir}/ant.d/apache-oro %{_mavenpomdir}/JPP.ant-ant-apache-oro.pom %dir %{_mavenpomdir} %files -n ant-apache-regexp -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-regexp @@ -712,7 +681,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-xalan2 -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 @@ -720,7 +688,6 @@ %dir %{_mavenpomdir} %files -n ant-javamail -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-javamail.jar %{ant_home}/lib/ant-javamail.jar %config(noreplace) %{_sysconfdir}/ant.d/javamail @@ -728,17 +695,15 @@ %dir %{_mavenpomdir} %files -n ant-jdepend -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jdepend.jar %{ant_home}/lib/ant-jdepend.jar %config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl +%{ant_home}%{_sysconfdir}/jdepend.xsl +%{ant_home}%{_sysconfdir}/jdepend-frames.xsl %{_mavenpomdir}/JPP.ant-ant-jdepend.pom %dir %{_mavenpomdir} %files -n ant-jsch -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jsch.jar %{ant_home}/lib/ant-jsch.jar %config(noreplace) %{_sysconfdir}/ant.d/jsch @@ -746,7 +711,6 @@ %dir %{_mavenpomdir} %files -n ant-testutil -%defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil @@ -754,7 +718,6 @@ %dir %{_mavenpomdir} %files -n ant-manual -%defattr(0644,root,root,0755) %doc manual/* %endif ++++++ ant-junit.spec ++++++ --- /var/tmp/diff_new_pack.WMYnRu/_old 2017-10-10 11:38:50.594383357 +0200 +++ /var/tmp/diff_new_pack.WMYnRu/_new 2017-10-10 11:38:50.598383181 +0200 @@ -3,7 +3,6 @@ # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +17,12 @@ # +%global ant_home %{_datadir}/ant +%global major_version 1.9 ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### %bcond_with bootstrap %bcond_without junit %bcond_with antlr - -%global ant_home %{_datadir}/ant - -%global major_version 1.9 - Name: ant-junit Version: 1.9.9 Release: 0 @@ -45,24 +41,18 @@ Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch Patch5: apache-ant-bootstrap.patch -%if %{with bootstrap} -BuildRequires: java-1_5_0-gcj-compat-devel -#BuildRequires: java-devel >= 1.5 -BuildConflicts: java-devel >= 1.9 -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless -%else -BuildRequires: java-devel >= 1.6.0 -%endif BuildRequires: antlr-bootstrap +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools +BuildRequires: unzip +BuildRequires: xml-commons-apis-bootstrap +#BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2-bootstrap +BuildArch: noarch # Needed for maven conversions %if !%{with bootstrap} BuildRequires: javapackages-local %endif -BuildRequires: unzip -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap -BuildRequires: xml-commons-apis-bootstrap %if %{with junit} || %{with antlr} BuildRequires: ant = %{version} BuildRequires: junit @@ -76,7 +66,7 @@ BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.5.0 +Requires: java-devel >= 1.6 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -98,9 +88,6 @@ Requires: junit4 %requires_eq ant %endif -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if %{with junit} %description Apache Ant is a Java-based build tool. @@ -154,14 +141,13 @@ %endif #if bootstrap %if %{with antlr} - %package -n ant-apache-bsf Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bsf Requires: bsf %requires_eq ant -BuildRequires: bsf %description -n ant-apache-bsf Apache Ant is a Java-based build tool. @@ -172,9 +158,9 @@ Summary: Optional apache resolver tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: xml-commons-resolver Requires: xml-commons-resolver %requires_eq ant -BuildRequires: xml-commons-resolver %description -n ant-apache-resolver Apache Ant is a Java-based build tool. @@ -185,9 +171,9 @@ Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-logging Requires: jakarta-commons-logging %requires_eq ant -BuildRequires: jakarta-commons-logging %description -n ant-commons-logging Apache Ant is a Java-based build tool. @@ -198,9 +184,9 @@ Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-net Requires: jakarta-commons-net %requires_eq ant -BuildRequires: jakarta-commons-net %description -n ant-commons-net Apache Ant is a Java-based build tool. @@ -211,9 +197,9 @@ Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bcel Requires: bcel %requires_eq ant -BuildRequires: bcel Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -226,9 +212,9 @@ Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: log4j-mini Requires: log4j %requires_eq ant -BuildRequires: log4j-mini Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -241,9 +227,9 @@ Summary: Optional apache oro tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: oro Requires: oro %requires_eq ant -BuildRequires: oro Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -256,9 +242,9 @@ Summary: Optional apache regexp tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: regexp Requires: regexp %requires_eq ant -BuildRequires: regexp Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -296,9 +282,9 @@ Summary: Optional jdepend tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jdepend Requires: jdepend %requires_eq ant -BuildRequires: jdepend %description -n ant-jdepend Apache Ant is a Java-based build tool. @@ -309,9 +295,9 @@ Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jsch Requires: jsch %requires_eq ant -BuildRequires: jsch %description -n ant-jsch Apache Ant is a Java-based build tool. @@ -351,9 +337,7 @@ %endif %patch1 %patch3 -p1 -%if ! %{with bootstrap} %patch4 -p1 -%endif %patch5 -p1 # clean jar files @@ -395,7 +379,7 @@ %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.5 -target 1.5" +export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" sh -x ./build.sh --noconfig jars %endif @@ -466,7 +450,7 @@ #install pom %if !%{with bootstrap} - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} + install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar %endif @@ -482,14 +466,14 @@ rm -f src/script/*.cmd # XSLs -cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc -rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl +cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir} +rm -f %{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %endif %if %{with junit} -cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with antlr} -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with bootstrap} @@ -535,7 +519,7 @@ %endif %if %{with bootstrap} -find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ +find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ -a ! -name coverage-frames.xsl \ @@ -547,9 +531,7 @@ %endif %if %{with bootstrap} - %files -%defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant @@ -559,15 +541,15 @@ %{_javadir}/%{name}-bootstrap.jar %dir %{_javadir}/%{name} %dir %{ant_home} -%dir %{ant_home}/etc +%dir %{ant_home}%{_sysconfdir} %{ant_home}/bin -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/coverage-frames.xsl -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl +%{ant_home}%{_sysconfdir}/ant-update.xsl +%{ant_home}%{_sysconfdir}/changelog.xsl +%{ant_home}%{_sysconfdir}/coverage-frames.xsl +%{ant_home}%{_sysconfdir}/mmetrics-frames.xsl +%{ant_home}%{_sysconfdir}/log.xsl +%{ant_home}%{_sysconfdir}/tagdiff.xsl +%{ant_home}%{_sysconfdir}/junit-frames-xalan1.xsl # % {ant_home}/etc/common2master.xsl # % {ant_home}/etc/printFailingTests.xsl %dir %{ant_home}/lib @@ -579,59 +561,55 @@ #%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant.pom -#%if %{?suse_version} > 1320 -#%{_datadir}/maven-metadata/ant.xml -#%else +#%if %{defined _maven_repository} #%config(noreplace) %{_mavendepmapfragdir}/ant +#%else +#%{_datadir}/maven-metadata/ant.xml #%endif #%dir %{_mavenpomdir} %endif + %if %{with antlr} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-antlr.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%else +%{_datadir}/maven-metadata/ant-antlr.xml %endif %dir %{_mavenpomdir} %endif %if %{with junit} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl +%{ant_home}%{_sysconfdir}/junit-frames.xsl +%{ant_home}%{_sysconfdir}/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-junit.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-junit +%else +%{_datadir}/maven-metadata/ant-junit.xml %endif %dir %{_mavenpomdir} %endif ### Basic ant subpackages %if %{with bootstrap} - %files -n ant-jmf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf #%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing @@ -645,9 +623,7 @@ %endif #if bootstrap %if %{with antlr} - %files -n ant-apache-bsf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bsf.jar %{ant_home}/lib/ant-apache-bsf.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bsf @@ -655,7 +631,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-resolver -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-resolver.jar %{ant_home}/lib/ant-apache-resolver.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-resolver @@ -663,7 +638,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-logging -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-logging.jar %{ant_home}/lib/ant-commons-logging.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-logging @@ -671,7 +645,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-net -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-net.jar %{ant_home}/lib/ant-commons-net.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-net @@ -679,7 +652,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-bcel -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel @@ -687,7 +659,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-log4j -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j @@ -695,16 +666,14 @@ %dir %{_mavenpomdir} %files -n ant-apache-oro -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-oro.jar %{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/etc/maudit-frames.xsl +%{ant_home}%{_sysconfdir}/maudit-frames.xsl %config(noreplace) %{_sysconfdir}/ant.d/apache-oro %{_mavenpomdir}/JPP.ant-ant-apache-oro.pom %dir %{_mavenpomdir} %files -n ant-apache-regexp -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-regexp @@ -712,7 +681,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-xalan2 -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 @@ -720,7 +688,6 @@ %dir %{_mavenpomdir} %files -n ant-javamail -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-javamail.jar %{ant_home}/lib/ant-javamail.jar %config(noreplace) %{_sysconfdir}/ant.d/javamail @@ -728,17 +695,15 @@ %dir %{_mavenpomdir} %files -n ant-jdepend -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jdepend.jar %{ant_home}/lib/ant-jdepend.jar %config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl +%{ant_home}%{_sysconfdir}/jdepend.xsl +%{ant_home}%{_sysconfdir}/jdepend-frames.xsl %{_mavenpomdir}/JPP.ant-ant-jdepend.pom %dir %{_mavenpomdir} %files -n ant-jsch -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jsch.jar %{ant_home}/lib/ant-jsch.jar %config(noreplace) %{_sysconfdir}/ant.d/jsch @@ -746,7 +711,6 @@ %dir %{_mavenpomdir} %files -n ant-testutil -%defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil @@ -754,7 +718,6 @@ %dir %{_mavenpomdir} %files -n ant-manual -%defattr(0644,root,root,0755) %doc manual/* %endif ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.WMYnRu/_old 2017-10-10 11:38:50.634381602 +0200 +++ /var/tmp/diff_new_pack.WMYnRu/_new 2017-10-10 11:38:50.638381426 +0200 @@ -3,7 +3,6 @@ # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +17,11 @@ # +%global ant_home %{_datadir}/ant +%global major_version 1.9 %bcond_without bootstrap %bcond_with junit %bcond_with antlr - -%global ant_home %{_datadir}/ant - -%global major_version 1.9 - Name: ant Version: 1.9.9 Release: 0 @@ -44,24 +40,18 @@ Patch3: reproducible.patch Patch4: apache-ant-1.9.9-sourcetarget.patch Patch5: apache-ant-bootstrap.patch -%if %{with bootstrap} -BuildRequires: java-1_5_0-gcj-compat-devel -#BuildRequires: java-devel >= 1.5 -BuildConflicts: java-devel >= 1.9 -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless -%else -BuildRequires: java-devel >= 1.6.0 -%endif BuildRequires: antlr-bootstrap +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools +BuildRequires: unzip +BuildRequires: xml-commons-apis-bootstrap +#BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2-bootstrap +BuildArch: noarch # Needed for maven conversions %if !%{with bootstrap} BuildRequires: javapackages-local %endif -BuildRequires: unzip -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap -BuildRequires: xml-commons-apis-bootstrap %if %{with junit} || %{with antlr} BuildRequires: ant = %{version} BuildRequires: junit @@ -75,7 +65,7 @@ BuildRequires: strip-nondeterminism %endif %if %{with bootstrap} -Requires: java-devel >= 1.5.0 +Requires: java-devel >= 1.6 Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis @@ -97,9 +87,6 @@ Requires: junit4 %requires_eq ant %endif -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if %{with junit} %description Apache Ant is a Java-based build tool. @@ -153,14 +140,13 @@ %endif #if bootstrap %if %{with antlr} - %package -n ant-apache-bsf Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bsf Requires: bsf %requires_eq ant -BuildRequires: bsf %description -n ant-apache-bsf Apache Ant is a Java-based build tool. @@ -171,9 +157,9 @@ Summary: Optional apache resolver tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: xml-commons-resolver Requires: xml-commons-resolver %requires_eq ant -BuildRequires: xml-commons-resolver %description -n ant-apache-resolver Apache Ant is a Java-based build tool. @@ -184,9 +170,9 @@ Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-logging Requires: jakarta-commons-logging %requires_eq ant -BuildRequires: jakarta-commons-logging %description -n ant-commons-logging Apache Ant is a Java-based build tool. @@ -197,9 +183,9 @@ Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jakarta-commons-net Requires: jakarta-commons-net %requires_eq ant -BuildRequires: jakarta-commons-net %description -n ant-commons-net Apache Ant is a Java-based build tool. @@ -210,9 +196,9 @@ Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: bcel Requires: bcel %requires_eq ant -BuildRequires: bcel Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -225,9 +211,9 @@ Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: log4j-mini Requires: log4j %requires_eq ant -BuildRequires: log4j-mini Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -240,9 +226,9 @@ Summary: Optional apache oro tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: oro Requires: oro %requires_eq ant -BuildRequires: oro Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -255,9 +241,9 @@ Summary: Optional apache regexp tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: regexp Requires: regexp %requires_eq ant -BuildRequires: regexp Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -295,9 +281,9 @@ Summary: Optional jdepend tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jdepend Requires: jdepend %requires_eq ant -BuildRequires: jdepend %description -n ant-jdepend Apache Ant is a Java-based build tool. @@ -308,9 +294,9 @@ Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building +BuildRequires: jsch Requires: jsch %requires_eq ant -BuildRequires: jsch %description -n ant-jsch Apache Ant is a Java-based build tool. @@ -350,9 +336,7 @@ %endif %patch1 %patch3 -p1 -%if ! %{with bootstrap} %patch4 -p1 -%endif %patch5 -p1 # clean jar files @@ -394,7 +378,7 @@ %if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME="%{java_home}" -export BOOTJAVAC_OPTS="-source 1.5 -target 1.5" +export BOOTJAVAC_OPTS="-source 1.6 -target 1.6" sh -x ./build.sh --noconfig jars %endif @@ -465,7 +449,7 @@ #install pom %if !%{with bootstrap} - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} + install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar %endif @@ -481,14 +465,14 @@ rm -f src/script/*.cmd # XSLs -cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc -rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl +cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir} +rm -f %{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %endif %if %{with junit} -cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with antlr} -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc +cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}%{_sysconfdir} %endif %if %{with bootstrap} @@ -534,7 +518,7 @@ %endif %if %{with bootstrap} -find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ +find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ -a ! -name coverage-frames.xsl \ @@ -546,9 +530,7 @@ %endif %if %{with bootstrap} - %files -%defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant @@ -558,15 +540,15 @@ %{_javadir}/%{name}-bootstrap.jar %dir %{_javadir}/%{name} %dir %{ant_home} -%dir %{ant_home}/etc +%dir %{ant_home}%{_sysconfdir} %{ant_home}/bin -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/coverage-frames.xsl -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl +%{ant_home}%{_sysconfdir}/ant-update.xsl +%{ant_home}%{_sysconfdir}/changelog.xsl +%{ant_home}%{_sysconfdir}/coverage-frames.xsl +%{ant_home}%{_sysconfdir}/mmetrics-frames.xsl +%{ant_home}%{_sysconfdir}/log.xsl +%{ant_home}%{_sysconfdir}/tagdiff.xsl +%{ant_home}%{_sysconfdir}/junit-frames-xalan1.xsl # % {ant_home}/etc/common2master.xsl # % {ant_home}/etc/printFailingTests.xsl %dir %{ant_home}/lib @@ -578,59 +560,55 @@ #%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant.pom -#%if %{?suse_version} > 1320 -#%{_datadir}/maven-metadata/ant.xml -#%else +#%if %{defined _maven_repository} #%config(noreplace) %{_mavendepmapfragdir}/ant +#%else +#%{_datadir}/maven-metadata/ant.xml #%endif #%dir %{_mavenpomdir} %endif + %if %{with antlr} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr %{_mavenpomdir}/JPP.ant-ant-antlr.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-antlr.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-antlr +%else +%{_datadir}/maven-metadata/ant-antlr.xml %endif %dir %{_mavenpomdir} %endif %if %{with junit} %files -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-junit*.jar %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl +%{ant_home}%{_sysconfdir}/junit-frames.xsl +%{ant_home}%{_sysconfdir}/junit-noframes.xsl %{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant-junit.xml -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/ant-junit +%else +%{_datadir}/maven-metadata/ant-junit.xml %endif %dir %{_mavenpomdir} %endif ### Basic ant subpackages %if %{with bootstrap} - %files -n ant-jmf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf #%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing @@ -644,9 +622,7 @@ %endif #if bootstrap %if %{with antlr} - %files -n ant-apache-bsf -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bsf.jar %{ant_home}/lib/ant-apache-bsf.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bsf @@ -654,7 +630,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-resolver -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-resolver.jar %{ant_home}/lib/ant-apache-resolver.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-resolver @@ -662,7 +637,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-logging -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-logging.jar %{ant_home}/lib/ant-commons-logging.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-logging @@ -670,7 +644,6 @@ %dir %{_mavenpomdir} %files -n ant-commons-net -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-net.jar %{ant_home}/lib/ant-commons-net.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-net @@ -678,7 +651,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-bcel -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel @@ -686,7 +658,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-log4j -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j @@ -694,16 +665,14 @@ %dir %{_mavenpomdir} %files -n ant-apache-oro -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-oro.jar %{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/etc/maudit-frames.xsl +%{ant_home}%{_sysconfdir}/maudit-frames.xsl %config(noreplace) %{_sysconfdir}/ant.d/apache-oro %{_mavenpomdir}/JPP.ant-ant-apache-oro.pom %dir %{_mavenpomdir} %files -n ant-apache-regexp -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-regexp @@ -711,7 +680,6 @@ %dir %{_mavenpomdir} %files -n ant-apache-xalan2 -%defattr(-,root,root,-) %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 @@ -719,7 +687,6 @@ %dir %{_mavenpomdir} %files -n ant-javamail -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-javamail.jar %{ant_home}/lib/ant-javamail.jar %config(noreplace) %{_sysconfdir}/ant.d/javamail @@ -727,17 +694,15 @@ %dir %{_mavenpomdir} %files -n ant-jdepend -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jdepend.jar %{ant_home}/lib/ant-jdepend.jar %config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl +%{ant_home}%{_sysconfdir}/jdepend.xsl +%{ant_home}%{_sysconfdir}/jdepend-frames.xsl %{_mavenpomdir}/JPP.ant-ant-jdepend.pom %dir %{_mavenpomdir} %files -n ant-jsch -%defattr(0644,root,root,0755) %{_javadir}/ant/ant-jsch.jar %{ant_home}/lib/ant-jsch.jar %config(noreplace) %{_sysconfdir}/ant.d/jsch @@ -745,7 +710,6 @@ %dir %{_mavenpomdir} %files -n ant-testutil -%defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil @@ -753,7 +717,6 @@ %dir %{_mavenpomdir} %files -n ant-manual -%defattr(0644,root,root,0755) %doc manual/* %endif
