From cb9d5e75d3e19bbd3ae453b058d5bcd24e79d414 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 28 2017 18:05:26 +0000 Subject: Fix requires - Use JDK's jaxp instead of xerces --- diff --git a/ant.spec b/ant.spec index 4dbd638..99c353c 100644 --- a/ant.spec +++ b/ant.spec @@ -32,11 +32,10 @@ %bcond_without javadoc %global ant_home %{_datadir}/ant -%global major_version 1.9 Name: ant Version: 1.10.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Java build tool Summary(it): Tool per la compilazione di programmi java @@ -110,6 +109,7 @@ Core part of Apache Ant that can be used as a library. %package jmf Summary: Optional jmf tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description jmf Optional jmf tasks for %{name}. @@ -119,6 +119,7 @@ Taches jmf optionelles pour %{name}. %package swing Summary: Optional swing tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description swing Optional swing tasks for %{name}. @@ -128,6 +129,7 @@ Taches swing optionelles pour %{name}. %package antlr Summary: Optional antlr tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description antlr Optional antlr tasks for %{name}. @@ -137,6 +139,7 @@ Taches antlr optionelles pour %{name}. %package apache-bsf Summary: Optional apache bsf tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-bsf Optional apache bsf tasks for %{name}. @@ -146,6 +149,7 @@ Taches apache bsf optionelles pour %{name}. %package apache-resolver Summary: Optional apache resolver tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-resolver Optional apache resolver tasks for %{name}. @@ -155,6 +159,7 @@ Taches apache resolver optionelles pour %{name}. %package commons-logging Summary: Optional commons logging tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description commons-logging Optional commons logging tasks for %{name}. @@ -164,6 +169,7 @@ Taches commons logging optionelles pour %{name}. %package commons-net Summary: Optional commons net tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description commons-net Optional commons net tasks for %{name}. @@ -175,6 +181,7 @@ Taches commons net optionelles pour %{name}. %if 0 %package jai Summary: Optional jai tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description jai Optional jai tasks for %{name}. @@ -185,6 +192,7 @@ Taches jai optionelles pour %{name}. %package apache-bcel Summary: Optional apache bcel tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-bcel Optional apache bcel tasks for %{name}. @@ -194,6 +202,7 @@ Taches apache bcel optionelles pour %{name}. %package apache-log4j Summary: Optional apache log4j tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-log4j Optional apache log4j tasks for %{name}. @@ -203,6 +212,7 @@ Taches apache log4j optionelles pour %{name}. %package apache-oro Summary: Optional apache oro tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-oro Optional apache oro tasks for %{name}. @@ -212,6 +222,7 @@ Taches apache oro optionelles pour %{name}. %package apache-regexp Summary: Optional apache regexp tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-regexp Optional apache regexp tasks for %{name}. @@ -221,6 +232,7 @@ Taches apache regexp optionelles pour %{name}. %package apache-xalan2 Summary: Optional apache xalan2 tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description apache-xalan2 Optional apache xalan2 tasks for %{name}. @@ -230,6 +242,7 @@ Taches apache xalan2 optionelles pour %{name}. %package javamail Summary: Optional javamail tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description javamail Optional javamail tasks for %{name}. @@ -239,6 +252,7 @@ Taches javamail optionelles pour %{name}. %package jdepend Summary: Optional jdepend tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description jdepend Optional jdepend tasks for %{name}. @@ -248,6 +262,7 @@ Taches jdepend optionelles pour %{name}. %package jsch Summary: Optional jsch tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description jsch Optional jsch tasks for %{name}. @@ -257,6 +272,7 @@ Taches jsch optionelles pour %{name}. %package junit Summary: Optional junit tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description junit Optional junit tasks for %{name}. @@ -266,12 +282,14 @@ Taches junit optionelles pour %{name}. %package testutil Summary: Test utility classes for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description testutil Test utility tasks for %{name}. %package xz Summary: Optional xz tasks for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description xz Optional xz tasks for %{name}. @@ -318,7 +336,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java src/tests/junit/org/apache/tools/mail/MailMessageTest.java #install jars -build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest/core xz-java +build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core xz-java # fix hardcoded paths in ant script and conf cp -p %{SOURCE2} %{name}.conf @@ -329,6 +347,9 @@ sed -e 's:/etc/ant.conf:%{_sysconfdir}/ant.conf:g' \ -e 's:/usr/share/java-utils/java-functions:%{_javadir}-utils/java-functions:g' \ -i src/script/ant %{name}.conf +# Remove unnecessary JARs from the classpath +sed -i 's/jaxp_parser_impl//;s/xml-commons-apis//' src/script/ant + # Fix file-not-utf8 rpmlint warning iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 mv KEYS.utf8 KEYS @@ -574,6 +595,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Tue Mar 28 2017 Michael Simacek - 0:1.10.1-6 +- Fix requires +- Use JDK's jaxp instead of xerces + * Tue Mar 21 2017 Michael Simacek - 0:1.10.1-5 - Install with XMvn