diff --git a/ant.spec b/ant.spec index 45200c5..e4c5ff2 100644 --- a/ant.spec +++ b/ant.spec @@ -36,7 +36,7 @@ Name: ant Version: 1.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Java build tool Summary(it): Tool per la compilazione di programmi java @@ -210,8 +210,8 @@ Taches apache bcel optionelles pour %{name}. %package apache-log4j Summary: Optional apache log4j tasks for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: log4j -BuildRequires: log4j +Requires: log4j12 +BuildRequires: log4j12 %description apache-log4j Optional apache log4j tasks for %{name}. @@ -354,7 +354,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 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest/core +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 # Fix file-not-utf8 rpmlint warning iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 @@ -366,7 +366,7 @@ mv LICENSE.utf8 LICENSE %{ant} jars test-jar %if %with javadoc -export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xerces-j2 xml-commons-apis) +export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xerces-j2 xml-commons-apis) %{ant} javadocs %endif @@ -445,7 +445,7 @@ echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_syscon echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j +echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 @@ -598,6 +598,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Fri Feb 10 2017 Michael Simacek - 0:1.10.0-3 +- Use log4j12 + * Fri Feb 10 2017 Fedora Release Engineering - 0:1.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild