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

- Symlink to ant-apache-bsf and ant-commons-net.

Browse Source 
- Update branding.
This commit is contained in:
Andrew Overholt 2008-10-03 14:09:39 +00:00
parent 07c31238f2
commit 56ebf50180
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,9 +1,7 @@
ecf-filetransfer-v20080611-1715.tar.bz2
eclipse-3.4.0-testframework.tar.bz2
eclipse-ecj-gcj.tar.bz2
eclipse-fileinitializerapp.tar.bz2
eclipse-sourceBuild-srcIncluded-3.4.zip
org.fedoraproject.ide.feature-1.0.0.zip
org.fedoraproject.ide.platform-3.4.0-1.zip
eclipse-sourceBuild-srcIncluded-3.4.1.zip
eclipse-3.4.1-testframework.tar.bz2
org.fedoraproject.ide.platform-3.4.1.zip

43
eclipse.spec
View File

@ -24,7 +24,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0%{?dist}
Release: 1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -32,13 +32,11 @@ Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-2008
Source2: %{name}.desktop
#Source3: eclipse.in
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipse-3_4_0-1 branding/org.fedoraproject.ide.platform
# -r fedoraeclipse-3_4_1 branding/org.fedoraproject.ide.platform
# cd branding
# zip -r org.fedoraproject.ide.platform-3.4.0-1.zip \
# zip -r org.fedoraproject.ide.platform-3.4.1.zip \
# org.fedoraproject.ide.platform
#TODO fix version
#Source4: org.fedoraproject.ide.platform-%{version}-1.zip
Source4: org.fedoraproject.ide.platform-3.4.0-1.zip
Source4: org.fedoraproject.ide.platform-%{version}.zip
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
# cd branding
@ -176,10 +174,7 @@ BuildRequires: java-devel >= 1.6.0
BuildRequires: java-javadoc
BuildRequires: libXt-devel
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
# Fedora. When that's done, add it here and symlink below.
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
BuildRequires: jsch >= 0:0.1.39
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@ -246,11 +241,7 @@ Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
# FIXME: investigate. Can we just add a %{arch} to the above?
## This file-level requirement is for the bi-arch multilib case
#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
# Fedora. When that's done, add it here and symlink below.
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
#Requires: ant-apache-bsf ant-commons-net
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
Requires: jakarta-commons-el >= 1.0-9
@ -516,15 +507,13 @@ rm $ANTDIR/lib/*
ANTDIR=$ANTDIR/lib
ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
#ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
# the symlinks that are commented-out are not currently shipped on Fedora
#ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
@ -1088,13 +1077,13 @@ ln -s %{_javadir}/ecj-%{version}.jar \
# Icons
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse48.png \
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse48.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse32.png \
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_3.4.0/eclipse.png \
ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
@ -1163,15 +1152,13 @@ rm $ANTDIR/lib/*
ANTDIR=$ANTDIR/lib
ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
#ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
# the symlinks that are commented-out are not currently shipped on Fedora
#ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
@ -1513,6 +1500,10 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Fri Oct 03 2008 Andrew Overholt <overholt@redhat.com> 3.4.1-1
- Symlink to ant-apache-bsf and ant-commons-net.
- Update branding.
* Thu Oct 03 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-0
- 3.4.1
- Update nojarsignatures patch.

4
sources
View File

@ -1,9 +1,7 @@
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
26ef7c2af793ec8b4ecffb62616483d1 eclipse-3.4.0-testframework.tar.bz2
43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
372361ae6f1355ec5cfb9a301ad690f5 org.fedoraproject.ide.platform-3.4.0-1.zip
5814fb2019f70f00c0952f29df1cac3d eclipse-sourceBuild-srcIncluded-3.4.1.zip
12f447b8b8df93ac2f4d97adb61c5c6f eclipse-3.4.1-testframework.tar.bz2
8dee24cd7db8bf1392768ccd4964aac1 org.fedoraproject.ide.platform-3.4.1.zip