From 697e9be56795b31cfe7970742ce42a7846937506 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Fri, 26 Nov 2004 20:39:39 +0000 Subject: [PATCH] - merge changes from RHEL-3 branch --- eclipse.spec | 71 +++++++++++++++++++++++++++++++--------------------- sources | 5 ++-- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 52b3b65..e4957f6 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -7,12 +7,12 @@ ExclusiveArch: i386 ia64 ppc %define pkg_summary An open extensible IDE %define section free -%define swt_version 3062 +%define swt_version 3063 %define corelib_version 2_1_0b %define eclipse_major 3 %define eclipse_minor 0 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 0 +%define eclipse_micro 1 %define libname libswt3 %ifarch %{ix86} @@ -51,11 +51,11 @@ ExclusiveArch: i386 ia64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 26 +Release: 3 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/downloads/drops/S-3.0M8-200403261517/eclipse-sourceBuild-srcIncluded-3.0.zip +Source0: http://download.eclipse.org/downloads/drops/R-3.0.1-200409161125/eclipse-sourceBuild-srcIncluded-3.0.1.zip Source1: %{name}.script Source2: %{name}.desktop Source3: %{name}-16.gif @@ -69,8 +69,9 @@ Source10: %{name}-source.install Source14: %{name}-gtk.install Source17: %{name}-tools-build.xml Source18: %{name}-redhat-splash.png -Source20: %{name}-rhdocs-r20040726.tar.gz +Source20: %{name}-rhdocs-r20041017.tar.gz Source21: %{name}-copy-platform.sh +Source22: %{name}-tutorials.pdf Patch0: %{name}-make-gtk.patch Patch1: %{name}-make-core.patch @@ -86,6 +87,7 @@ Patch20: %{name}-gtk-launcher.patch Patch21: %{name}-org.eclipse.help.appserver-host.patch Patch22: %{name}-welcome-screen.patch Patch23: %{name}-cvs-permission-bits.patch +Patch24: %{name}-cvs-permission-bits2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -142,14 +144,6 @@ Requires: %{name}-ui = %{version}-%{release} %description jdt Eclipse Java developments tools. -# %package ftp-webdav -# Summary: Eclipse FTP and WebDAV plugins -# Group: Text Editors/Integrated Development Environments (IDE) -# Requires: %{name}-ui = %{version}-%{release} -# -# %description ftp-webdav -# Eclipse FTP and WebDAV plugins. - %package source Summary: Eclipse Source Group: Text Editors/Integrated Development Environments (IDE) @@ -207,8 +201,11 @@ popd pushd "plugins/org.eclipse.platform" %patch22 -p0 popd -pushd "plugins" -%patch23 -p1 +pushd "plugins/org.eclipse.team.cvs.core" +%patch23 -p0 +popd +pushd "plugins/org.eclipse.team.cvs.ui" +%patch24 -p0 popd # Red Hat splash screen. @@ -256,6 +253,8 @@ fi %build export ANT_OPTS=-Xmx768m +#find -name \*.jar -exec rm -f {} \; +# pushd plugins/org.eclipse.swt.tools rm -f swttools.jar %{ant} \ @@ -273,10 +272,8 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/' -Dbootclasspath= \ compile -# Overwrite eclipse.org documentation with our own +# Overwrite eclipse.org documentation with our own and then build the docs pushd plugins -echo 'BUILD DOCS HERE' -echo '%{_datadir}' '%{eclipse_arch}' '%{buildDirectory}' '%{assemblyTempDir}' ln org.eclipse.platform/startup.jar ../. for buildDoc in `/usr/bin/gzip -dc %{SOURCE20} | tar -vxf - | grep build.xml`; do pushd `echo $buildDoc | sed -e 's/build.xml//g'` @@ -353,7 +350,7 @@ popd pushd plugins/org.eclipse.team.cvs.core/library make \ -JAVA_HOME="{%java_home}" \ +JAVA_HOME="%{java_home}" \ OS="linux" \ clean all popd @@ -406,10 +403,9 @@ popd install -d -m 755 $RPM_BUILD_ROOT%{_jnidir} install -d -m 755 $RPM_BUILD_ROOT%{_libdir} -## begin core lib symlinks - -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.0/os/linux/%{eclipse_arch} -pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.0/os/linux/%{eclipse_arch} +### begin core lib symlinks +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} +pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} ln -sf %{_libdir}/%{name}/libcore_%{corelib_version}.so libcore_%{corelib_version}.so popd @@ -417,7 +413,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update. pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux ln -sf %{_libdir}/%{name}/libupdate.so libupdate.so popd - ### end core lib symlinks ### begin libswt-gtk2 symlinks @@ -467,6 +462,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} perl -pe 's|/usr/lib/eclipse/|%{_datadir}/%{name}/|g' \ %{SOURCE6} > $RPM_BUILD_ROOT%{_sysconfdir}/eclipse.conf +# symlink for build scripts that rely on 3.0.0 path +pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins +ln -s org.eclipse.pde.build_%{eclipse_majmin}.%{eclipse_micro} org.eclipse.pde.build_3.0.0 +popd + # rh/freedesktop.org icons install -p -D -m0644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png @@ -478,6 +478,10 @@ install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/%{name}.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps +# rh docs +install -p -D -m0644 %{SOURCE22} \ + $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{eclipse_majmin}.%{eclipse_micro}/%{name}-tutorial.pdf + # A sanity check. desktop-file-validate %{SOURCE2} @@ -490,7 +494,6 @@ cat %{SOURCE8} > %{name}-pde.install cat %{SOURCE9} > %{name}-platform.install cat %{SOURCE10} > %{name}-source.install -# cat %{SOURCE11} > %{name}-webdav-ftp.install cat %{SOURCE14} > %{name}-gtk.install cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF @@ -549,9 +552,6 @@ rm -rf $RPM_BUILD_ROOT %files jdt -f %{name}-jdt.install %defattr(0644,root,root,0755) -# %files ftp-webdav -f %{name}-webdav-ftp.install -# %defattr(0644,root,root,0755) - %files source -f %{name}-source.install %defattr(0644,root,root,0755) @@ -567,6 +567,21 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/eclipse.conf %changelog +* Mon Nov 22 2004 Ben Konrath 3.0.1-3 +- split cvs-permission-bits.patch in two +- bug fix for cvs-permission-bits.patch + +* Fri Oct 29 2004 Ben Konrath 3.0.1-2 +- add symlink for releng plugins that rely on o.e.pde.build_3.0.0 + +* Fri Oct 29 2004 Ben Konrath 3.0.1-1 +- updated to Eclipse 3.0.1 +- updated jnigen patch +- removed some debugging print statements +- updated Red Hat documentaion sources +- added Red Hat documentation pdf +- remove commented ftp-webdav stuff as it will be in it's own spec file + * Tue Oct 04 2004 Aaron Luchko 3.0.0-26 - Changed the splash screen from a bmp to a png and fixed - copyright date diff --git a/sources b/sources index 1232077..7f2025d 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -5cb4251098dc47f5c73bb918b27c6475 eclipse-rhdocs-r20040726.tar.gz -962a41fe062f0ddc809ca956687c7e01 eclipse-sourceBuild-srcIncluded-3.0.zip +c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip +87c0c34661b3e033a9d994ed8015d4c2 eclipse-rhdocs-r20041017.tar.gz +423393fad6f9c220037d38d1098ffcec eclipse-tutorials.pdf