Minor rebuild-sdk-features touch-ups.
This commit is contained in:
parent
b722cbfe1c
commit
8581d1e32d
|
@ -142,6 +142,7 @@ BuildRequires: java-devel >= 1.4.2
|
|||
%endif
|
||||
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
#BuildRequires: ant-commons-net
|
||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
BuildRequires: jsch >= 0:0.1.18-1jpp
|
||||
|
@ -204,6 +205,7 @@ Requires: java-javadoc
|
|||
PreReq: gtk2 >= 2.6
|
||||
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
#Requires: ant-commons-net
|
||||
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
Requires: jsch >= 0:0.1.18-1jpp
|
||||
|
@ -451,6 +453,7 @@ ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-
|
|||
ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
|
||||
ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
|
||||
ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
|
||||
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
|
||||
|
@ -462,6 +465,7 @@ ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
|
|||
ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
|
||||
ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
|
||||
# We don't have this in FC5
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
|
||||
# We used to ship these pre-built, but we're not going to do that anymore. If
|
||||
# we can build them using free stuff, we will. -- overholt, 2005-07-04
|
||||
|
@ -582,7 +586,7 @@ ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
|
|||
|
||||
gcj-dbtool -n jdtcoresrc/ecj.db 30000
|
||||
gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
|
||||
|
||||
|
||||
# Remove our gcj-built ecj
|
||||
rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
|
||||
|
||||
|
@ -1274,7 +1278,7 @@ fi
|
|||
|
||||
%changelog
|
||||
* Fri Feb 10 2006 Ben Konrath <bkonrath@redhat.com> 3.1.2-1jpp_6fc
|
||||
- Update the rebuild-sdk-features script to use the 3.1 updatesite.
|
||||
- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
|
||||
|
||||
* Tue Feb 07 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_5fc
|
||||
- Use new java-1.4.2-gcj-compat-javadoc package.
|
||||
|
|
Loading…
Reference in New Issue