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

- Add links for jsp api, servlet api and jasper. 

- Add %%{_libdir}/%%{name}/features to the rcp %%files listing.
This commit is contained in:
Ben Konrath 2007-08-10 16:50:53 +00:00
parent d7e6ecb843
commit 556f63a9b3
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eclipse.spec
View File

@ -19,7 +19,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 5%{?dist}
Release: 6%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -85,6 +85,7 @@ BuildRequires: mesa-libGLU-devel
BuildRequires: cairo >= 1.0
BuildRequires: unzip
BuildRequires: icu4j-eclipse >= 3.6.1
BuildRequires: tomcat5-jasper-eclipse >= 5.5.17
BuildRequires: java-javadoc
BuildRequires: desktop-file-utils
%if %{gcj_support}
@ -229,8 +230,9 @@ Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-j
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
Requires: mx4j >= 2.1
Requires: tomcat5 >= 5.5.23
Requires: tomcat5-jasper >= 5.5.23
Requires: tomcat5-jasper-eclipse >= 5.5.23
Requires: tomcat5-servlet-2.4-api >= 5.5.23
Requires: tomcat5-jsp-2.0-api >= 5.5.23
Requires: jsch >= 0.1.31
Requires: lucene >= 1.9.1
Requires: lucene-contrib >= 1.9.1
@ -619,6 +621,20 @@ ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v
rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
# link to jasper
rm plugins/org.apache.jasper_5.5.17.v200706111724.jar
ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar \
plugins/org.apache.jasper_5.5.17.v200706111724.jar
# link to serlet-api
rm plugins/javax.servlet_2.4.0.v200706111738.jar
ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar
# link to jsp-api
rm plugins/javax.servlet.jsp_2.0.0.v200706191603.jar
ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar plugins/javax.servlet.jsp_2.0.0.v200706191603.jar
# delete included jars
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
@ -1077,6 +1093,17 @@ ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v
rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
# link to jasper
rm plugins/org.apache.jasper_5.5.17.v200706111724.jar
# link to serlet-api
rm plugins/javax.servlet_2.4.0.v200706111738.jar
ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar
# link to jsp-api
rm plugins/javax.servlet.jsp_2.0.0.v200706191603.jar
ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar plugins/javax.servlet.jsp_2.0.0.v200706191603.jar
popd
# Ensure that the zip files are the same across all builds.
@ -1294,6 +1321,7 @@ fi
%files rcp
%defattr(-,root,root)
%dir %{_datadir}/%{name}/features
%dir %{_libdir}/%{name}/features
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy*
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
@ -1400,7 +1428,6 @@ fi
%{_datadir}/%{name}/plugins/org.apache.ant_*
%{_datadir}/%{name}/plugins/org.apache.commons.el_*
%{_datadir}/%{name}/plugins/org.apache.commons.logging_*
%{_datadir}/%{name}/plugins/org.apache.jasper_*
%{_datadir}/%{name}/plugins/org.apache.lucene_*
%{_datadir}/%{name}/plugins/org.apache.lucene.analysis_*
%{_datadir}/%{name}/plugins/org.eclipse.ant.core_*
@ -1467,9 +1494,6 @@ fi
%{_datadir}/%{name}/plugins/org.mortbay.jetty_*
%{_datadir}/%{name}/plugins/org.eclipse.equinox.initializer_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/javax.servlet_*
%{_libdir}/gcj/%{name}/javax.servlet.jsp_*
%{_libdir}/gcj/%{name}/org.apache.jasper_*
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
%{_libdir}/gcj/%{name}/org.eclipse.compare_*
%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
@ -1629,6 +1653,10 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
* Tue Aug 07 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-6
- Add links for jsp api, servlet api and jasper.
- Add %%{_libdir}/%%{name}/features to the rcp %%files listing.
* Fri Aug 03 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-5
- Add patch to fix double free bug in launcher library.
- Resolves: #248798.