From 8c8401fc37e130b11cab849c980c24e56050e503 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 04:28:48 +0000 Subject: auto-import changelog data from eclipse-3.0.0-21.src.rpm Thu Jul 22 2004 Tom Tromey 3.0.0-21 - Set eclipse_arch for ppc - Tell build about real platform - Make swt.gtk install directory Thu Jul 22 2004 Jeremy Handcock 3.0.0-20 - Don't build on ppc64 - Change Requires and BuildRequires to java >= 1.4.2 - eclipse-platform package obsoletes old eclipse package Wed Jul 21 2004 Jeremy Handcock 3.0.0-19 - Update copy-platform with patch from Keith Seitz Tue Jul 20 2004 Tom Tromey 3.0.0-18 - Allow copy-platform to copy non-core parts as well Tue Jul 20 2004 Jeremy Handcock 3.0.0-17 - Update Red Hat documentation sources Tue Jul 20 2004 Ben Konrath 3.0.0-16 - Add patch for welcome screen --- diff --git a/.cvsignore b/.cvsignore index fe49d27..d0faa8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -eclipse-rhdocs-r20040517.tar.gz +eclipse-rhdocs-r20040720.tar.gz eclipse-sourceBuild-srcIncluded-3.0.zip diff --git a/eclipse-copy-platform.sh b/eclipse-copy-platform.sh index a9d0f6d..ae9fb95 100644 --- a/eclipse-copy-platform.sh +++ b/eclipse-copy-platform.sh @@ -9,11 +9,24 @@ # Arguments are: # * directory where results should end up (script will make it) # * base location of eclipse platform install +# * an optional string that is used to select non-platform +# plugins and features. At present if a plugin or feature has +# this as a substring, it will be included. You need only run +# this script once, it will link both the platform and the other +# optionally-selected parts in a single invocation. where=$1 eclipse=$2 +optional=$3 mkdir $where cd $where mkdir plugins features +if test -n "$optional"; then + (cd $eclipse; ls -d plugins/*"$optional"* features/*"$optional"*) | + while read f; do + ln -s $eclipse/$f $f + done +fi + # Code after this point is automatically created by eclipse.spec. diff --git a/eclipse.spec b/eclipse.spec index ac3afbb..dd611c7 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -3,7 +3,7 @@ # The intersection of the IBM-supported platforms and # the platforms we want. -ExclusiveArch: i386 ia64 ppc ppc64 +ExclusiveArch: i386 ia64 ppc %define pkg_summary An open extensible IDE %define section free @@ -27,6 +27,10 @@ ExclusiveArch: i386 ia64 ppc ppc64 %define eclipse_arch ia64 %define java_arch ia64 %endif +%ifarch ppc +%define eclipse_arch ppc +%define java_arch ppc +%endif %ifarch ppc64 %define eclipse_arch ppc64 %define java_arch ppc @@ -47,7 +51,7 @@ ExclusiveArch: i386 ia64 ppc ppc64 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 15 +Release: 21 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -66,7 +70,7 @@ Source14: %{name}-gtk.install Source17: %{name}-tools-build.xml Source18: %{name}-redhat-splash.bmp Source19: %{name}-unblock.c -Source20: %{name}-rhdocs-r20040517.tar.gz +Source20: %{name}-rhdocs-r20040720.tar.gz Source21: %{name}-copy-platform.sh Patch0: %{name}-make-gtk.patch @@ -81,6 +85,7 @@ Patch18: %{name}-make-gtk4.patch Patch19: %{name}-jnigen.patch Patch20: %{name}-gtk-launcher.patch Patch21: %{name}-org.eclipse.help.appserver-host.patch +Patch22: %{name}-welcome-screen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -95,7 +100,7 @@ BuildRequires: %{_libdir}/pkgconfig/gtk+-2.0.pc # MDK 9.1: libglib2.0_0-devel # RH 8.0, 9, FC 1: glib2-devel BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc -BuildRequires: java >= 1.4.1 +BuildRequires: java >= 1.4.2 %description @@ -108,9 +113,9 @@ JavaBeans(tm). Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) Provides: %{name} = %{version}-%{release} -Obsoletes: %{name}-sdk +Obsoletes: %{name}-sdk eclipse Provides: %{name}-sdk -Requires: java >= 1.4.1 +Requires: java >= 1.4.2 %description platform Eclipse platform common files. In addition to this, you'll need the @@ -199,6 +204,9 @@ popd pushd "plugins/org.eclipse.help.appserver" %patch21 -p0 popd +pushd "plugins/org.eclipse.platform" +%patch22 -p0 +popd # Overwrite eclipse.org documentation with our own pushd plugins @@ -257,7 +265,8 @@ export ANT_OPTS=-Xmx768m pushd plugins/org.eclipse.swt.tools rm -f swttools.jar -$unblock %{ant} -Dos=linux -Dws=gtk -Darch=%{eclipse_arch} \ +$unblock %{ant} \ + -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -Dbuild.compiler=modern \ -DjavacVerbose=false -DjavacFailOnError=true \ -Dbootclasspath= @@ -265,8 +274,8 @@ popd mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/' $unblock %{ant} -buildfile build.xml \ - -DinstallOs=linux -DinstallWs=gtk \ - -DinstallArch=x86 -Dbuild.compiler=modern \ + -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ + -Dbuild.compiler=modern \ -DjavacVerbose=false -DjavacFailOnError=true \ -Dbootclasspath= \ compile @@ -410,6 +419,7 @@ ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{ecli ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar popd +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} for base in atk-gtk gnome-gtk gtk pi-gtk; do ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \ @@ -536,6 +546,28 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 22 2004 Tom Tromey 3.0.0-21 +- Set eclipse_arch for ppc +- Tell build about real platform +- Make swt.gtk install directory + +* Thu Jul 22 2004 Jeremy Handcock 3.0.0-20 +- Don't build on ppc64 +- Change Requires and BuildRequires to java >= 1.4.2 +- eclipse-platform package obsoletes old eclipse package + +* Wed Jul 21 2004 Jeremy Handcock 3.0.0-19 +- Update copy-platform with patch from Keith Seitz + +* Tue Jul 20 2004 Tom Tromey 3.0.0-18 +- Allow copy-platform to copy non-core parts as well + +* Tue Jul 20 2004 Jeremy Handcock 3.0.0-17 +- Update Red Hat documentation sources + +* Tue Jul 20 2004 Ben Konrath 3.0.0-16 +- Add patch for welcome screen + * Mon Jul 19 2004 Tom Tromey 3.0.0-15 - Don't require IBM JDK - Don't build AWT/SWT interaction code diff --git a/sources b/sources index dff1bba..443730b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -93fcf89cbf5f5f5d6f7ac42570f1f19d eclipse-rhdocs-r20040517.tar.gz +871a44b24220db89274721753794d2ab eclipse-rhdocs-r20040720.tar.gz 962a41fe062f0ddc809ca956687c7e01 eclipse-sourceBuild-srcIncluded-3.0.zip