rpms/eclipse/devel eclipse.spec,1.453,1.454

[Ben Konrath (bkonrath)]

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2488

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jul 18 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-3
- Add links for lucene and lucene.analysis.
- Remove icu4j symlink from /usr/share/eclipse/plugins.
- Resolves: #248749.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- eclipse.spec	17 Jul 2007 15:55:36 -0000	1.453
+++ eclipse.spec	18 Jul 2007 20:14:23 -0000	1.454
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist} 
+Release:        3%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -103,8 +103,8 @@
 BuildRequires: tomcat5 >= 5.5.23
 BuildRequires: tomcat5-jasper >= 5.5.23
 BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23
-BuildRequires: lucene
-BuildRequires: lucene-devel
+BuildRequires: lucene >= 1.9.1
+BuildRequires: lucene-contrib >= 1.9.1
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
@@ -229,8 +229,9 @@
 Requires: tomcat5 >= 5.5.23
 Requires: tomcat5-jasper >= 5.5.23
 Requires: tomcat5-servlet-2.4-api >= 5.5.23
-Requires: jsch >= 0:0.1.31
-Requires: lucene, lucene-devel
+Requires: jsch >= 0.1.31
+Requires: lucene >= 1.9.1
+Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 
 %description    platform
@@ -608,8 +609,10 @@
 ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar plugins/com.ibm.icu_3.6.1.v20070417.jar
 
 # link to lucene
-#rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
-#ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar
+rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
+ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar
+rm plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar
+ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar
 
 # link to commons-logging
 rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
@@ -1058,11 +1061,12 @@
 
 # link to the icu4j stuff
 rm plugins/com.ibm.icu_3.6.1.v20070417.jar
-ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar plugins/com.ibm.icu_3.6.1.v20070417.jar
 
 # link to lucene
-#rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
-#ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar
+rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
+ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar
+rm plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar
+ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar
 
 # link to commons-logging
 rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
@@ -1463,8 +1467,6 @@
 %{_libdir}/gcj/%{name}/javax.servlet.jsp_*
 %{_libdir}/gcj/%{name}/org.apache.commons.el_*
 %{_libdir}/gcj/%{name}/org.apache.jasper_*
-%{_libdir}/gcj/%{name}/org.apache.lucene_*
-%{_libdir}/gcj/%{name}/org.apache.lucene.analysis_*
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.compare_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
@@ -1624,6 +1626,11 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Wed Jul 18 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-3
+- Add links for lucene and lucene.analysis.
+- Remove icu4j symlink from /usr/share/eclipse/plugins.
+- Resolves: #248749.
+
 * Mon Jul 16 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-2
 - Fix dep in rcp sub-package.
 - Add Alpha support.