Allow leading separators in classpaths (e.o#105430)
This commit is contained in:
parent
ab4036a308
commit
fe022bf8c7
15
eclipse.spec
15
eclipse.spec
|
@ -24,7 +24,7 @@ Epoch: 1
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
Release: 10
|
||||
Release: 11
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
@ -96,6 +96,8 @@ Patch33: %{name}-compare-create-api.patch
|
|||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
|
||||
Patch34: %{name}-bz162177.patch
|
||||
Patch35: %{name}-javadoc.patch
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
|
||||
Patch36: %{name}-ecj-classpath.patch
|
||||
|
||||
%if %{gcj_support}
|
||||
ExclusiveArch: %{ix86} x86_64 ppc
|
||||
|
@ -351,6 +353,7 @@ pushd plugins/org.eclipse.compare
|
|||
popd
|
||||
%patch34 -p1
|
||||
%patch35 -p0
|
||||
%patch36 -p1
|
||||
|
||||
%if %{gcj_support}
|
||||
# Fedora splash screen.
|
||||
|
@ -392,7 +395,6 @@ ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-co
|
|||
#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
|
||||
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
|
||||
#ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
|
||||
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
|
||||
ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
|
||||
ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
|
||||
|
@ -752,7 +754,6 @@ ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_*/lib/ant-
|
|||
#ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
|
||||
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib
|
||||
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
|
||||
#ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_*/lib/ant-jmf.jar
|
||||
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
|
||||
ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_*/lib/ant-junit.jar
|
||||
ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant_*/lib/ant-launcher.jar
|
||||
|
@ -765,6 +766,7 @@ rm -f plugins/org.apache.ant_*/lib/ant-commons-net.jar
|
|||
# we can build them using free stuff, we will. -- overholt, 2005-07-04
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-icontract.jar
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
|
||||
|
@ -837,8 +839,7 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
|
|||
aot-compile-rpm \
|
||||
--exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar \
|
||||
--exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar \
|
||||
--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar \
|
||||
--exclude %{_datadir}/%{name}/plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar
|
||||
--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar
|
||||
|
||||
# Build and install ecj binary
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
|
||||
|
@ -1160,6 +1161,10 @@ fi
|
|||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
|
||||
|
||||
%changelog
|
||||
* Thu Jul 28 2005 Gary Benson <gbenson@redhat.com> 3.1.0_fc-11
|
||||
- Allow leading separators in classpaths (e.o#105430).
|
||||
- Clear away ant-jmf entirely.
|
||||
|
||||
* Mon Jul 25 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-10
|
||||
- Change mozilla BuildRequirement to be equals and not greater-than or equals
|
||||
since we need the exact version for our patches.
|
||||
|
|
Loading…
Reference in New Issue