rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- more 64-bit platform and launching script fixes 

- add ppc
This commit is contained in:
Andrew Overholt 2005-01-17 19:09:19 +00:00
parent fd8a051e7b
commit daae71c65e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eclipse.spec
View File

@ -3,7 +3,7 @@
# The intersection of the IBM-supported platforms and # The intersection of the IBM-supported platforms and
# the platforms we want. # the platforms we want.
ExclusiveArch: i386 ExclusiveArch: i386 ppc
%define pkg_summary An open extensible IDE %define pkg_summary An open extensible IDE
%define section free %define section free
@ -55,7 +55,7 @@ ExclusiveArch: i386
Summary: %{pkg_summary} Summary: %{pkg_summary}
Name: eclipse Name: eclipse
Version: %{eclipse_majmin} Version: %{eclipse_majmin}
Release: 0.%{eclipse_milestone}.18 Release: 0.%{eclipse_milestone}.19
License: CPL License: CPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -104,13 +104,17 @@ BuildRequires: jpackage-utils >= 0:1.5, make, gcc
BuildRequires: xalan-j2, xerces-j2, xml-commons-apis BuildRequires: xalan-j2, xerces-j2, xml-commons-apis
# MDK 9.1 libgnome-vfs2_0-devel # MDK 9.1 libgnome-vfs2_0-devel
# RH 8.0, 9, FC 1: gnome-vfs2-devel # RH 8.0, 9, FC 1: gnome-vfs2-devel
BuildRequires: %{_libdir}/pkgconfig/gnome-vfs-2.0.pc # BuildRequires: %{_libdir}/pkgconfig/gnome-vfs-2.0.pc
# Trying to use %{_libdir} causes problems on 64-bit arches
BuildRequires: gnome-vfs2-devel
# MDK 9.1: libgtk+2.0_0-devel # MDK 9.1: libgtk+2.0_0-devel
# RH 8.0, 9, FC 1: gtk2-devel # RH 8.0, 9, FC 1: gtk2-devel
BuildRequires: %{_libdir}/pkgconfig/gtk+-2.0.pc # BuildRequires: %{_libdir}/pkgconfig/gtk+-2.0.pc
BuildRequires: gtk2-devel
# MDK 9.1: libglib2.0_0-devel # MDK 9.1: libglib2.0_0-devel
# RH 8.0, 9, FC 1: glib2-devel # RH 8.0, 9, FC 1: glib2-devel
BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc # BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc
BuildRequires: glib2-devel
BuildRequires: gcc4-java >= 4.0.0-0.17 BuildRequires: gcc4-java >= 4.0.0-0.17
BuildRequires: java-devel >= 1.4.2 BuildRequires: java-devel >= 1.4.2
@ -246,7 +250,7 @@ perl -pi -e 's|failonerror="[A-Za-z]*"|failonerror="yes"|g' \
# extend it later if need be. # extend it later if need be.
src= src=
dest= dest=
%ifarch ia64 ppc64 sparc64 %ifarch sparc64
src=amd64 src=amd64
dest=%{eclipse_arch} dest=%{eclipse_arch}
%endif %endif
@ -344,8 +348,7 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
suff= suff=
%ifarch alpha ia64 ppc64 sparc64 x86_64 %ifarch alpha ia64 ppc64 sparc64 x86_64
#echo "gtk64" suff=.gtk64/src
#suff=.gtk64
%endif %endif
# Symlink some gtk sources. # Symlink some gtk sources.
@ -371,6 +374,7 @@ swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib64"
swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib" swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib"
%endif %endif
%endif %endif
# FIXME: /usr/lib/gcc is because /usr/lib64/gcc... isn't correct on x86_64
make \ make \
$swtflags \ $swtflags \
JAVA_HOME="%{java_home}" \ JAVA_HOME="%{java_home}" \
@ -378,7 +382,7 @@ JAVA_JNI="%{java_home}/include" \
AWT_LIB_PATH="%{java_home}/jre/bin" \ AWT_LIB_PATH="%{java_home}/jre/bin" \
JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -DNO_LONG -I%{java_home}/include \ JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -DNO_LONG -I%{java_home}/include \
-I%{java_home}/include/linux \ -I%{java_home}/include/linux \
-I%_libdir}/gcc/%{arch}-redhat-linux/4.0.0/include/"\ -I/usr/lib/gcc/%{arch}-redhat-linux/4.0.0/include/"\
MOZILLA_HOME="" \ MOZILLA_HOME="" \
MOZILLA_INCLUDE_BASE="/usr/include/mozilla-1.4.2" \ MOZILLA_INCLUDE_BASE="/usr/include/mozilla-1.4.2" \
MOZILLA_LIBFLAG="" \ MOZILLA_LIBFLAG="" \
@ -681,6 +685,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%changelog %changelog
* Mon Jan 17 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.19
- more 64-bit platform and launching script fixes
- add ppc
* Sat Jan 15 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.18 * Sat Jan 15 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.18
- script path fixes - script path fixes
- x86_64 fixes - x86_64 fixes