[ant] - Drop gcj support. - Drop jaf BR/R it is part of Java 5+.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 6 21:47:17 UTC 2010
commit 0e59ea726537a9f959b97144286b3392eee8fe05
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Oct 7 00:46:57 2010 +0300
- Drop gcj support.
- Drop jaf BR/R it is part of Java 5+.
ant.spec | 387 +-------------------------------------------------------------
1 files changed, 5 insertions(+), 382 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 9726d6e..763c62d 100644
--- a/ant.spec
+++ b/ant.spec
@@ -41,10 +41,6 @@
%global build_javadoc 1
%endif
-%global _with_gcj_support 1
-
-%global gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
%global with_manifest_only 0
%global ant_home %{_datadir}/ant
@@ -54,7 +50,7 @@
Name: ant
Version: 1.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -88,9 +84,7 @@ Requires: xerces-j2
Requires: xml-commons-jaxp-1.3-apis
%endif
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: ant-optional < %{epoch}:%{version}-%{release}
Provides: ant-optional = %{epoch}:%{version}-%{release}
@@ -108,9 +102,6 @@ Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
Provides: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-core < %{epoch}:%{version}-%{release}
Provides: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-%endif
Requires(post): jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5
@@ -370,9 +361,7 @@ Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: javamail >= 0:1.2-5jpp
-Requires: jaf >= 0:1.0.1-5jpp
BuildRequires: javamail >= 0:1.2-5jpp
-BuildRequires: jaf >= 0:1.0.1-5jpp
Provides: ant-javamail = %{epoch}:%{version}-%{release}
%description javamail
@@ -639,12 +628,6 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
| xargs -t rm
%endif
-# -----------------------------------------------------------------------------
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -652,314 +635,9 @@ rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%postun
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post jmf
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun jmf
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post nodeps
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun nodeps
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post swing
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun swing
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %without bootstrap
-%if %{gcj_support}
-%post commons-net
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun commons-net
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-# We do not ship dependencies for these, so they are disabled.
-%if 0
-%if %{gcj_support}
-%post jai
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun jai
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%endif
-
-%if %{gcj_support}
-%post antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-bcel
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-bcel
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-log4j
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-log4j
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-regexp
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-regexp
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-xalan2
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-xalan2
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-resolver
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-resolver
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post junit
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun junit
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-oro
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-oro
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post javamail
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun javamail
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post commons-logging
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun commons-logging
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post jdepend
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun jdepend
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post jsch
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun jsch
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post apache-bsf
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun apache-bsf
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%endif
%files
%defattr(0644,root,root,0755)
@@ -994,11 +672,6 @@ fi
%dir %{_sysconfdir}/%{name}.d
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-%{version}.jar.*
-%endif
%files jmf
%defattr(0644,root,root,0755)
@@ -1006,9 +679,6 @@ fi
%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
%{ant_home}/lib/%{name}-jmf.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
-%endif
%files nodeps
%defattr(0644,root,root,0755)
@@ -1016,9 +686,6 @@ fi
%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
%{ant_home}/lib/%{name}-nodeps.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
-%endif
%files swing
%defattr(0644,root,root,0755)
@@ -1026,9 +693,6 @@ fi
%{_javadir}/%{name}/%{name}-swing-%{version}.jar
%{ant_home}/lib/%{name}-swing.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/swing
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
-%endif
%if %without bootstrap
%if %{with_manifest_only}
@@ -1058,9 +722,6 @@ fi
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
%{ant_home}/lib/%{name}-antlr.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-%{version}.jar.*
-%endif
%files apache-bsf
%defattr(0644,root,root,0755)
@@ -1068,9 +729,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%{ant_home}/lib/%{name}-apache-bsf.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-%{version}.jar.*
-%endif
%files apache-resolver
%defattr(0644,root,root,0755)
@@ -1078,9 +736,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
%{ant_home}/lib/%{name}-apache-resolver.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-%{version}.jar.*
-%endif
%files commons-logging
%defattr(0644,root,root,0755)
@@ -1088,9 +743,6 @@ fi
%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
%{ant_home}/lib/%{name}-commons-logging.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-%{version}.jar.*
-%endif
%files commons-net
%defattr(0644,root,root,0755)
@@ -1098,9 +750,6 @@ fi
%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
%{ant_home}/lib/%{name}-commons-net.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-%{version}.jar.*
-%endif
# Disable as we dont ship the dependencies
%if 0
@@ -1110,9 +759,6 @@ fi
%{_javadir}/%{name}/%{name}-jai-%{version}.jar
%{ant_home}/lib/%{name}-jai.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jai
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-%{version}.jar.*
-%endif
%endif
%files apache-bcel
@@ -1121,9 +767,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
%{ant_home}/lib/%{name}-apache-bcel.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-%{version}.jar.*
-%endif
%files apache-log4j
%defattr(0644,root,root,0755)
@@ -1131,9 +774,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
%{ant_home}/lib/%{name}-apache-log4j.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-%{version}.jar.*
-%endif
%files apache-oro
%defattr(0644,root,root,0755)
@@ -1142,9 +782,6 @@ fi
%{ant_home}/lib/%{name}-apache-oro.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
%{ant_home}/etc/maudit-frames.xsl
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-%{version}.jar.*
-%endif
%files apache-regexp
%defattr(0644,root,root,0755)
@@ -1152,9 +789,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
%{ant_home}/lib/%{name}-apache-regexp.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
-%endif
%files apache-xalan2
%defattr(0644,root,root,0755)
@@ -1162,9 +796,6 @@ fi
%{_javadir}/%{name}/%{name}-apache-xalan2-%{version}.jar
%{ant_home}/lib/%{name}-apache-xalan2.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-xalan2-%{version}.jar.*
-%endif
%files javamail
%defattr(0644,root,root,0755)
@@ -1172,9 +803,6 @@ fi
%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
%{ant_home}/lib/%{name}-javamail.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-%{version}.jar.*
-%endif
%files jdepend
%defattr(0644,root,root,0755)
@@ -1184,9 +812,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
%{ant_home}/etc/jdepend.xsl
%{ant_home}/etc/jdepend-frames.xsl
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-%{version}.jar.*
-%endif
%files jsch
%defattr(0644,root,root,0755)
@@ -1194,9 +819,6 @@ fi
%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
%{ant_home}/lib/%{name}-jsch.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-%{version}.jar.*
-%endif
%files junit
%defattr(0644,root,root,0755)
@@ -1206,9 +828,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-%{version}.jar.*
-%endif
%files scripts
%defattr(0755,root,root,0755)
@@ -1229,6 +848,10 @@ fi
# -----------------------------------------------------------------------------
%changelog
+* Thu Oct 7 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.1-5
+- Drop gcj support.
+- Drop jaf BR/R it is part of Java 5+.
+
* Fri Oct 1 2010 Orion Poplawski <orion at cora.nwra.com> 0:1.8.1-4
- Move ant-trax Provides/Obsoletes to ant-nodeps
More information about the scm-commits
mailing list