rpms/eclipse/FC-4 eclipse-libswt-mozilla.patch, 1.5, 1.6 eclipse.spec, 1.149, 1.150

[fedora-cvs-commits at redhat.com]

Author: overholt

Update of /cvs/dist/rpms/eclipse/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24352

Modified Files:
	eclipse-libswt-mozilla.patch eclipse.spec 
Log Message:
* Wed Jul 27 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-11
- Bump release for FC4 update.

* Mon Jul 25 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-10
- Change mozilla BuildRequirement to be equals and not greater-than or equals
  since we need the exact version for our patches.
- Bump mozilla requirements and patches to 1.7.10.
- Bump release due to FC4 update still not being released.
- Add ant-jmf to exclude list.


eclipse-libswt-mozilla.patch:
 build.sh |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

Index: eclipse-libswt-mozilla.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-libswt-mozilla.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-libswt-mozilla.patch	16 May 2005 21:40:40 -0000	1.5
+++ eclipse-libswt-mozilla.patch	27 Jul 2005 20:39:26 -0000	1.6
@@ -6,15 +6,15 @@
  	"Linux")
 +		GECKO_INCLUDES="\
 +			-include mozilla-config.h \
-+			-I/usr/include/mozilla-1.7.8 \
-+			-I/usr/include/mozilla-1.7.8/xpcom \
-+			-I/usr/include/mozilla-1.7.8/string \
-+			-I/usr/include/mozilla-1.7.8/nspr \
-+			-I/usr/include/mozilla-1.7.8/embed_base \
-+			-I/usr/include/mozilla-1.7.8/gfx"
++			-I/usr/include/mozilla-1.7.10 \
++			-I/usr/include/mozilla-1.7.10/xpcom \
++			-I/usr/include/mozilla-1.7.10/string \
++			-I/usr/include/mozilla-1.7.10/nspr \
++			-I/usr/include/mozilla-1.7.10/embed_base \
++			-I/usr/include/mozilla-1.7.10/gfx"
 +		GECKO_LIBS="\
-+			-L/usr/lib/mozilla-1.7.8 \
-+			-L/usr/lib/mozilla-1.7.8/components \
++			-L/usr/lib/mozilla-1.7.10 \
++			-L/usr/lib/mozilla-1.7.10/components \
 +			-lgtkembedmoz -lxpcom"
 +		# Set this to something to override the presets
 +		GECKO_SDK="_"


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- eclipse.spec	21 Jul 2005 21:42:38 -0000	1.149
+++ eclipse.spec	27 Jul 2005 20:39:26 -0000	1.150
@@ -24,7 +24,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        9
+Release:        11
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -111,9 +111,9 @@
 BuildRequires:  glib2-devel
 BuildRequires:  gcc-c++
 %ifnarch ppc64
-BuildRequires:  mozilla >= 37:1.7.8
-BuildRequires:  mozilla-devel >= 37:1.7.8
-BuildRequires:  mozilla-nspr-devel >= 37:1.7.8
+BuildRequires:  mozilla = 37:1.7.10
+BuildRequires:  mozilla-devel = 37:1.7.10
+BuildRequires:  mozilla-nspr-devel = 37:1.7.10
 BuildRequires:  xorg-x11-devel
 %endif
 %if %{gcj_support}
@@ -842,6 +842,7 @@
 --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar \
 --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar \
 --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar
+--exclude %{_datadir}/%{name}/plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar
 
 # Build and install ecj binary
 pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -1163,6 +1164,16 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Wed Jul 27 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-11
+- Bump release for FC4 update.
+
+* Mon Jul 25 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-10
+- Change mozilla BuildRequirement to be equals and not greater-than or equals
+  since we need the exact version for our patches.
+- Bump mozilla requirements and patches to 1.7.10.
+- Bump release due to FC4 update still not being released.
+- Add ant-jmf to exclude list.
+
 * Thu Jul 21 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-9
 - Bump release for FC4 update.
 - Bump gcc requirement to that available in FC4 updates.