- Link to commons-el.jar.
- Remove ant 1.7 hacks.
This commit is contained in:
parent
aa34311b7c
commit
491b3aaab2
@ -367,7 +367,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
|
||||
+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
|
||||
+ }
|
||||
+ this.destinationPath = arg;
|
||||
+ this.generatePackagesStructure = true;
|
||||
+ // this.generatePackagesStructure = true;
|
||||
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
|
||||
+ classpath = getArgument(currentArg);
|
||||
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
|
||||
|
28
eclipse.spec
28
eclipse.spec
@ -557,12 +557,6 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt
|
||||
assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
|
||||
features/org.eclipse.rcp/build.xml
|
||||
|
||||
# we don't have ant 1.7 right now
|
||||
sed --in-place "s|\(initialValue = request.getDefaultValue\)|// \1|" \
|
||||
plugins/org.eclipse.ant.ui/Ant\ Runner\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
|
||||
sed --in-place "s|\(value = fRequest.getDefaultValue\)|// \1|" \
|
||||
plugins/org.eclipse.ant.ui/Remote\ Ant\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/SWTInputHandler.java
|
||||
|
||||
## Nasty hack to get suppport for ppc64, s390{,x}, sparc{,64} and alpha
|
||||
%patch24 -p1
|
||||
# there is only partial support for ppc64 so we have to remove this
|
||||
@ -618,6 +612,10 @@ ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.
|
||||
rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
|
||||
ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
|
||||
|
||||
# link to commons-el
|
||||
rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
|
||||
ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
|
||||
|
||||
# delete included jars
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
|
||||
rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
|
||||
@ -1072,6 +1070,10 @@ ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.
|
||||
rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
|
||||
ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
|
||||
|
||||
# link to commons-el
|
||||
rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
|
||||
ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
|
||||
|
||||
popd
|
||||
|
||||
# Ensure that the zip files are the same across all builds.
|
||||
@ -1109,12 +1111,12 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t
|
||||
# move the contents over to the a new directory in order and set the times.
|
||||
for f in `find -type f | LC_ALL=C sort`; do
|
||||
cp $f $ZIPDIR2/$f
|
||||
touch --date="1970-01-01 UTC" $ZIPDIR2/$f
|
||||
touch --date="1980-01-01 UTC" $ZIPDIR2/$f
|
||||
done
|
||||
popd
|
||||
|
||||
# Set the times of the directories.
|
||||
touch --date="1970-01-01 UTC" `find $ZIPDIR2 -type d`
|
||||
touch --date="1980-01-01 UTC" `find $ZIPDIR2 -type d`
|
||||
|
||||
# make the new zip
|
||||
pushd $ZIPDIR2
|
||||
@ -1135,12 +1137,12 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t
|
||||
# move the contents over to the a new directory in order and set the times.
|
||||
for f in `find -type f | LC_ALL=C sort`; do
|
||||
cp $f $ZIPDIR/$f
|
||||
touch --date="1970-01-01 UTC" $ZIPDIR/$f
|
||||
touch --date="1980-01-01 UTC" $ZIPDIR/$f
|
||||
done
|
||||
popd
|
||||
|
||||
# Set the times of the directories.
|
||||
touch --date="1970-01-01 UTC" `find $ZIPDIR -type d`
|
||||
touch --date="1980-01-01 UTC" `find $ZIPDIR -type d`
|
||||
|
||||
# make the new zip
|
||||
pushd $ZIPDIR
|
||||
@ -1464,7 +1466,6 @@ fi
|
||||
%if %{gcj_support}
|
||||
%{_libdir}/gcj/%{name}/javax.servlet_*
|
||||
%{_libdir}/gcj/%{name}/javax.servlet.jsp_*
|
||||
%{_libdir}/gcj/%{name}/org.apache.commons.el_*
|
||||
%{_libdir}/gcj/%{name}/org.apache.jasper_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.compare_*
|
||||
@ -1625,8 +1626,9 @@ fi
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 26 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-4
|
||||
- Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch.
|
||||
* Tue Jul 31 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-4
|
||||
- Link to commons-el.jar.
|
||||
- Remove ant 1.7 hacks.
|
||||
|
||||
* Wed Jul 18 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-3
|
||||
- Add links for lucene and lucene.analysis.
|
||||
|
Loading…
Reference in New Issue
Block a user