rpms/eclipse/devel eclipse.spec,1.638,1.639

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/devel

Modified Files:
	eclipse.spec 
Log Message:
* Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.5
- Bump tomcat6 BR.
- Fix director run to not require sed on bundles.info.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -p -r1.638 -r1.639
--- eclipse.spec	22 Apr 2009 08:18:30 -0000	1.638
+++ eclipse.spec	29 Apr 2009 09:23:58 -0000	1.639
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.4%{?dist}
+Release:        0.2.5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -183,7 +183,7 @@ BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
 BuildRequires:  icu4j-eclipse >= 4.0.1
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
-BuildRequires:  tomcat6-servlet-2.5-api
+BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
@@ -255,7 +255,7 @@ Requires: jakarta-commons-el >= 1.0-9
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
-Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
+Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
 Requires: jetty >= 5.1.14-1.6
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
@@ -840,6 +840,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 
+cp plugins/org.eclipse.ecf* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+cp plugins/org.apache.commons.codec* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+cp plugins/org.apache.commons.httpclient* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 # ECF filetransfer plugins we built
 #rm $sdkDir/plugins/org.eclipse.ecf*.jar
 #unzip -d $RPM_BUILD_ROOT%{_libdir} \
@@ -1044,10 +1048,10 @@ rm -r $sdkDir/configuration/org.eclipse.
 
 %if %{initialize}
 #Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+#sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+#sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+#  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1587,6 +1591,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.5
+- Bump tomcat6 BR.
+- Fix director run to not require sed on bundles.info.
+
 * Wed Apr 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.4
 - Update to newer I-build.
 - Update fedora customization.