SPECS: eclipse.spec - being work on 3.1, NFY, builds, moving out sw...

[djurban]

Author: djurban                      Date: Thu Jun 30 17:39:19 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- being work on 3.1, NFY,builds, moving out swt to eclipse-swt.spec

---- Files affected:
SPECS:
   eclipse.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.44 SPECS/eclipse.spec:1.45
--- SPECS/eclipse.spec:1.44	Sat May 21 17:01:58 2005
+++ SPECS/eclipse.spec	Thu Jun 30 19:39:13 2005
@@ -6,8 +6,11 @@
 #			  This will make building such things like Azureus possible without having
 #			  whole Eclipse suite installed.
 #
-%define		_buildid	200504011645
-%define		_mver		M6
+
+%bcond_without	gnome
+
+%define		_buildid	200506271435
+#define		_mver		M6
 %define		_ver_major	3.1
 %define		_ver_minor	0
 %define		_ver		%{_ver_major}.%{_ver_minor}
@@ -16,11 +19,13 @@
 Summary(pl):	Eclipse - otwarte, rozszerzalne środowisko programistyczne
 Name:		eclipse
 Version:	%{_ver_major}
-Release:	0.%{_mver}_%{_buildid}.1
+#Release:	0.%{_mver}_%{_buildid}.1
+Release:	1
 License:	CPL v1.0
 Group:		Development/Tools
-Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
-# Source0-md5:	51d81345d2fa0e8aa0b455f6cf4c447f
+#Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}.zip
+# Source0-md5:	19ad65d52005da5eaa1d3687b3a50de2
 Source1:	%{name}.desktop
 Patch0:		%{name}-swt-makefile.patch
 Patch1:		%{name}-core_resources-makefile.patch
@@ -30,9 +35,6 @@
 URL:		http://www.eclipse.org/
 BuildRequires:	jakarta-ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
-BuildRequires:	kdelibs-devel
-BuildRequires:	libgnomeui-devel
-#BuildRequires:	mozilla-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
@@ -64,19 +66,28 @@
 %patch1 -p0
 %patch2 -p1
 # Patch3 is used below in build section
-%patch4 -p1
+#patch4 -p1
 
 %build
 JAVA_HOME=%{_libdir}/java
 export JAVA_HOME
+%if 0
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
+%endif
 
 %ifarch %{x8664}
-%define	_swtsrcdir	plugins/org.eclipse.swt.gtk64
-%define	_swtgtkdir	plugins/org.eclipse.swt.gtk64
-%else
-%define	_swtsrcdir	plugins/org.eclipse.swt.gtk
-%define	_swtgtkdir	plugins/org.eclipse.swt.gtk
+%define	_swtsrcdir	plugins/org.eclipse.swt.gtk.linux.x86_64
+%define	_swtgtkdir	plugins/org.eclipse.swt.gtk.linux.x86_64
+%endif
+
+%ifarch ppc
+%define	_swtsrcdir	plugins/org.eclipse.swt.gtk.linux.ppc
+%define	_swtgtkdir	plugins/org.eclipse.swt.gtk.linux.ppc
+%endif
+	
+%ifarch %{ix86}
+%define	_swtsrcdir	plugins/org.eclipse.swt.gtk.linux.x86
+%define	_swtgtkdir	plugins/org.eclipse.swt.gtk.linux.x86
 %endif
 
 rm -rf swt
@@ -84,6 +95,7 @@
 
 unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/src.zip
 
+
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
 patch -p0 < %{PATCH0}
@@ -293,6 +305,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2005/06/30 17:39:13  djurban
+- being work on 3.1, NFY,builds, moving out swt to eclipse-swt.spec
+
 Revision 1.44  2005/05/21 15:01:58  prism
 - added TODO
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eclipse.spec?r1=1.44&r2=1.45&f=u