SPECS: eclipse.spec - Wrote: /home/users/djurban/rpm/RPMS/eclipse-...

djurban djurban at pld-linux.org
Thu Jun 30 23:54:28 CEST 2005 

Author: djurban                      Date: Thu Jun 30 21:54:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Wrote: /home/users/djurban/rpm/RPMS/eclipse-3.1-0.1.athlon.rpm
- I hope it works, not sure yet, thats why 0.1, please test it.
- not sure if it depends on eclipse-swt, probably not

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

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.45 SPECS/eclipse.spec:1.46
--- SPECS/eclipse.spec:1.45	Thu Jun 30 19:39:13 2005
+++ SPECS/eclipse.spec	Thu Jun 30 23:54:23 2005
@@ -7,8 +7,6 @@
 #			  whole Eclipse suite installed.
 #
 
-%bcond_without	gnome
-
 %define		_buildid	200506271435
 #define		_mver		M6
 %define		_ver_major	3.1
@@ -20,18 +18,16 @@
 Name:		eclipse
 Version:	%{_ver_major}
 #Release:	0.%{_mver}_%{_buildid}.1
-Release:	1
+Release:	0.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:	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
-Patch2:		%{name}-jikesbuild.patch
-Patch3:		%{name}-swt-NULL.patch
-Patch4:		%{name}-string.patch
+Patch0:		%{name}-core_resources-makefile.patch
+Patch1:		%{name}-jikesbuild.patch
+Patch2:		%{name}-string.patch
 URL:		http://www.eclipse.org/
 BuildRequires:	jakarta-ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
@@ -62,54 +58,20 @@
 
 %prep
 %setup -q -c
-# Patch0 is used below in build section
-%patch1 -p0
-%patch2 -p1
-# Patch3 is used below in build section
-#patch4 -p1
+%patch0 -p0
+%patch1 -p1
+#patch2 -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.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
-mkdir swt && cd swt
+./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
 
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/src.zip
 
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
-patch -p0 < %{PATCH0}
-patch -p0 < %{PATCH3}
-%{__make} -f make_linux.mak all \
-    CC="%{__cc}" \
-    CXX="%{__cxx}" \
-    XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
-    OPT="%{rpmcflags}"
-#cp library/* .
-#{__make} -f make_linux.mak make_mozilla \
-#    OPT="%{rpmcflags}"
-cd ..
-
 #mkdir plugins/org.eclipse.core.resources.linux/os/linux/%{_eclipse_arch}
 %{__make} -C plugins/org.eclipse.core.resources.linux/src \
     CFLAGS="%{rpmcflags} $JAVA_INC" \
@@ -125,14 +87,17 @@
 mv libupdate.so ../os/linux/%{_eclipse_arch}
 cd -
 
+
 %install
+
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
 install -d $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_3.1.0/os/linux/%{_eclipse_arch}
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
 
-tar xfz result/org.eclipse.sdk-I*-linux.gtk.%{_eclipse_arch}.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
+
+tar xfz result/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 #wrapper
@@ -142,13 +107,6 @@
 exec %{_libdir}/%{name}/eclipse \$*
 EOF
 
-cd swt
-#install libswt-{atk-gtk,awt-gtk,gnome-gtk,gtk,kde,pi-gtk}-*.so \
-install libswt-*.so \
-    $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
-#install libswt-mozilla-gtk-*.so \
-#    $RPM_BUILD_ROOT%{_libdir}/eclipse/%{_swtgtkdir}_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -160,6 +118,8 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
 %{_libdir}/%{name}/configuration
+%{_libdir}/%{name}/eclipse.ini
+%{_libdir}/%{name}/epl-v10.html
 %{_libdir}/%{name}/icon.xpm
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
@@ -173,6 +133,8 @@
 %{_libdir}/%{name}/features/org.eclipse.pde.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.platform_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.platform.source_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.rcp_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.rcp.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
 
 # plugins
@@ -189,12 +151,12 @@
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
 
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}/libcore_3_1_0.so
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/fragment.xml
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*.jar
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}
+#%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}/libcore_3_1_0.so
+#%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/fragment.xml
 
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*.*.*
@@ -238,30 +200,15 @@
 %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.source_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{_eclipse_arch}_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{_eclipse_arch}_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{_eclipse_arch}_*.*.*.jar
 %{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
 
-%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*
-%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os
-%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux
-%dir %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-awt-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-kde-gtk*.so
-#%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-mozilla-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/os/linux/%{_eclipse_arch}/libswt-pi-gtk-*.so
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/ws
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/META-INF
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/about.html
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/cpl-v10.html
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.properties
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/fragment.xml
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/lgpl-v21.txt
-#%{_libdir}/%{name}/%{_swtgtkdir}_*.*.*/mpl-v11.txt
 
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
@@ -287,17 +234,18 @@
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.core_*.*.*
 
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}/libupdate.so
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/about.html
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/fragment.xml
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*.jar
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux
+#%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}
+#%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}/libupdate.so
+#%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/about.html
+#%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/fragment.xml
 
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -305,6 +253,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2005/06/30 21:54:23  djurban
+- Wrote: /home/users/djurban/rpm/RPMS/eclipse-3.1-0.1.athlon.rpm
+- I hope it works, not sure yet, thats why 0.1, please test it.
+- not sure if it depends on eclipse-swt, probably not
+
 Revision 1.45  2005/06/30 17:39:13  djurban
 - being work on 3.1, NFY,builds, moving out swt to eclipse-swt.spec
 
================================================================

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

More information about the pld-cvs-commit mailing list