Adding patches that got left in the move from /cvs/pkgs
This commit is contained in:
aluchko
parent
ca65845f6a
commit
5e550aaffb
5
Makefile
5
Makefile
|
|
@ -1,6 +1,5 @@
|
|||
# Makefile for source rpm: eclipse
|
||||
# $Id$
|
||||
NAME := eclipse
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
SPECFILE = $(NAME).spec
|
||||
COLLECTION = dist-3.0E-jpkg
|
||||
|
||||
include ../common/Makefile.common
|
||||
|
|
|
|||
65
eclipse.spec
65
eclipse.spec
|
|
@ -51,7 +51,7 @@ ExclusiveArch: i386 ia64 ppc
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 22
|
||||
Release: 25
|
||||
License: CPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -69,7 +69,6 @@ Source10: %{name}-source.install
|
|||
Source14: %{name}-gtk.install
|
||||
Source17: %{name}-tools-build.xml
|
||||
Source18: %{name}-redhat-splash.bmp
|
||||
Source19: %{name}-unblock.c
|
||||
Source20: %{name}-rhdocs-r20040726.tar.gz
|
||||
Source21: %{name}-copy-platform.sh
|
||||
|
||||
|
|
@ -86,6 +85,7 @@ Patch19: %{name}-jnigen.patch
|
|||
Patch20: %{name}-gtk-launcher.patch
|
||||
Patch21: %{name}-org.eclipse.help.appserver-host.patch
|
||||
Patch22: %{name}-welcome-screen.patch
|
||||
Patch23: %{name}-cvs-permission-bits.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: ant
|
||||
|
|
@ -207,10 +207,8 @@ popd
|
|||
pushd "plugins/org.eclipse.platform"
|
||||
%patch22 -p0
|
||||
popd
|
||||
|
||||
# Overwrite eclipse.org documentation with our own
|
||||
pushd plugins
|
||||
/usr/bin/gzip -dc %{SOURCE20} | tar -xf -
|
||||
pushd "plugins"
|
||||
%patch23 -p1
|
||||
popd
|
||||
|
||||
# Red Hat splash screen.
|
||||
|
|
@ -256,16 +254,11 @@ fi
|
|||
|
||||
|
||||
%build
|
||||
|
||||
# We need this program because beehive sets signals strangely.
|
||||
gcc -ansi -o unblock %{SOURCE19}
|
||||
unblock=$(pwd)/unblock
|
||||
|
||||
export ANT_OPTS=-Xmx768m
|
||||
|
||||
pushd plugins/org.eclipse.swt.tools
|
||||
rm -f swttools.jar
|
||||
$unblock %{ant} \
|
||||
%{ant} \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||
-Dbuild.compiler=modern \
|
||||
-DjavacVerbose=false -DjavacFailOnError=true \
|
||||
|
|
@ -273,13 +266,28 @@ $unblock %{ant} \
|
|||
popd
|
||||
|
||||
mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
|
||||
$unblock %{ant} -buildfile build.xml \
|
||||
%{ant} -buildfile build.xml \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||
-Dbuild.compiler=modern \
|
||||
-DjavacVerbose=false -DjavacFailOnError=true \
|
||||
-Dbootclasspath= \
|
||||
compile
|
||||
|
||||
# Overwrite eclipse.org documentation with our own
|
||||
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'`
|
||||
if [ -e buildDoc.xml ]; then
|
||||
java -cp ../../startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner -v -f buildDoc.xml
|
||||
fi
|
||||
popd
|
||||
done
|
||||
rm ../startup.jar
|
||||
popd
|
||||
|
||||
suff=
|
||||
%ifarch alpha ia64 ppc64 sparc64 x86_64
|
||||
suff=.gtk64/src
|
||||
|
|
@ -343,13 +351,18 @@ pushd plugins/org.eclipse.update.core.linux/src
|
|||
gcc $RPM_OPT_FLAGS -fPIC -o libupdate.so -shared *.c -I. -I%{java_home}/include -I%{java_home}/include/linux
|
||||
popd
|
||||
|
||||
pushd plugins/org.eclipse.team.cvs.core/library
|
||||
make \
|
||||
JAVA_HOME="{%java_home}" \
|
||||
OS="linux" \
|
||||
clean all
|
||||
popd
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
unblock=$(pwd)/unblock
|
||||
|
||||
export ANT_OPTS=-Xmx768m
|
||||
$unblock %{ant} \
|
||||
%{ant} \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||
-Dbuild.compiler=modern \
|
||||
-DjavacVerbose=false -DjavacFailOnError=true \
|
||||
|
|
@ -384,6 +397,7 @@ suff=.gtk64/src
|
|||
cp -p plugins/org.eclipse.update.core.linux/src/libupdate*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
cp -p plugins/org.eclipse.core.resources.linux/os/linux/%{eclipse_arch}/libcore_*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
cp -p plugins/org.eclipse.swt${suff}/os/linux/%{eclipse_arch}/libswt*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
cp -p plugins/org.eclipse.team.cvs.core/library/libcvs.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
chmod 755 eclipse *.so
|
||||
|
|
@ -429,6 +443,13 @@ popd
|
|||
|
||||
### end libswt-gtk2 symlinks
|
||||
|
||||
### begin libcvs symlink
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
|
||||
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
|
||||
ln -sf %{_libdir}/%{name}/libcvs.so libcvs.so
|
||||
popd
|
||||
### end libcvs symlink
|
||||
|
||||
### begin jar symlinks
|
||||
(cd $RPM_BUILD_ROOT%{_jnidir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
|
||||
### end jar symlinks
|
||||
|
|
@ -508,6 +529,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
|
||||
%{_datadir}/%{name}/eclipse
|
||||
%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/libcvs.so
|
||||
|
||||
%files gtk2 -f %{name}-gtk.install
|
||||
%defattr(0644,root,root,0755)
|
||||
|
|
@ -544,8 +566,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_datadir}/icons/*/*/apps/*
|
||||
%config(noreplace) %{_sysconfdir}/eclipse.conf
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 31 2004 Aaron Luchko <aluchko@redhat.com> 3.0.0-25
|
||||
- Building docs after the main build using headless eclise
|
||||
to build the extension points
|
||||
|
||||
* Mon Aug 16 2004 Ben Konrath <bkonrath@redhat.com> 3.0.0-24
|
||||
- Add cvs permission bits patch
|
||||
|
||||
* Wed Aug 04 2004 Elliot Lee <sopwith@redhat.com> 3.0.0-23
|
||||
- Unblock hack no longer needed.
|
||||
|
||||
* Mon Jul 26 2004 Jeremy Handcock <handcock@redhat.com> 3.0.0-22
|
||||
- Update Red Hat documentation sources
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue