Attachment 300274 Details for Bug 439825 – relevant sections of 3.3.2, etc. patch

[patch] relevant sections of 3.3.2, etc. patch

eclipse.spec.patch (text/plain), 2.12 KB, created by Andrew Overholt on 2008-04-03 16:01:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Overholt

Created: 2008-04-03 16:01:52 UTC

Size: 2.12 KB

patch

obsolete

>Index: eclipse.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
>retrieving revision 1.517
>diff -u -p -r1.517 eclipse.spec
>--- eclipse.spec	31 Mar 2008 18:45:06 -0000	1.517
>+++ eclipse.spec	3 Apr 2008 15:43:09 -0000
>@@ -153,8 +151,8 @@ JavaBeans(tm).
> %package        ecj
> Summary:        Eclipse Compiler for Java
> Group:          Development/Languages
>-Obsoletes:      ecj <= 2.1.3
>-Provides:       ecj <= 2.1.3
>+Obsoletes:      ecj < %{version}-%{release}
>+Provides:       ecj <= %{version}-%{release}
> %if %{gcj_support}
> Requires:       libgcj >= 4.0.2
> Requires(post):     java-gcj-compat >= 1.0.64
>@@ -941,8 +937,18 @@ popd
> # Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
> JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
>-ln -s %{_javadir}/eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
>+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
>+  $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar
>+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
>+ln -s %{_javadir}/eclipse-ecj-%{version}.jar
>+  $RPM_BUILD_ROOT%{_javadir}/jdtcore-%{version}.jar
>+ln -s %{_javadir}/jdtcore-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
>+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/ecj-%{version}.jar
>+ln -s %{_javadir}/ecj-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/ecj.jar
> 
> # FIXME: get rid of this by putting logic in package build to know what version
> #        of pde.build it's using
>@@ -1284,8 +1290,9 @@ fi
> %dir %{_datadir}/%{name}
> %dir %{_datadir}/%{name}/plugins
> %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
>-%{_javadir}/eclipse-ecj.jar
>-%{_javadir}/jdtcore.jar
>+%{_javadir}/eclipse-ecj*.jar
>+%{_javadir}/jdtcore*.jar
>+%{_javadir}/ecj*.jar
> %{_bindir}/ecj
> %if %{gcj_support}
> %dir %{_libdir}/gcj/%{name}

Actions: View | Diff

Attachments on bug 439825: 300274