SPECS: eclipse.spec - more updates (build/install/files)

arekm arekm at pld-linux.org
Sat Apr 22 00:46:36 CEST 2006 

Author: arekm                        Date: Fri Apr 21 22:46:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more updates (build/install/files)

---- Files affected:
SPECS:
   eclipse.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.55 SPECS/eclipse.spec:1.56
--- SPECS/eclipse.spec:1.55	Fri Apr 21 20:45:42 2006
+++ SPECS/eclipse.spec	Sat Apr 22 00:46:31 2006
@@ -23,7 +23,7 @@
 # Source0-md5:	ce7957ba841223b7ad6e2f4623086d95
 Source1:	%{name}.desktop
 Patch0:		%{name}-core_resources-makefile.patch
-Patch1:		%{name}-jikesbuild.patch
+Patch1:		%{name}-build.patch
 URL:		http://www.eclipse.org/
 BuildRequires:	jakarta-ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
@@ -52,7 +52,7 @@
 %prep
 %setup -q -c
 %patch0 -p0
-#%patch1 -p1
+%patch1 -p0
 
 %build
 export JAVA_HOME=%{_libdir}/java
@@ -61,10 +61,10 @@
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
-%{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
-    CFLAGS="%{rpmcflags} $JAVA_INC" \
-    LDFLAGS="%{rpmldflags}"
-mv plugins/org.eclipse.core.filesystem/natives/unix/linux/{src/libcore*.so,os/linux/%{_eclipse_arch}}
+#%{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
+#    CFLAGS="%{rpmcflags} $JAVA_INC" \
+#    LDFLAGS="%{rpmldflags}"
+#mv plugins/org.eclipse.core.filesystem/natives/unix/linux/{src/lib*.so,os/linux/%{_eclipse_arch}}
 
 cd plugins/org.eclipse.update.core.linux/src
 %{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
@@ -78,11 +78,13 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{features,plugins}
 
 export JAVA_HOME=%{_libdir}/java
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
+./build -os linux -ws gtk -arch %{_eclipse_arch} -target install -java5home %{_libdir}/java
 
 tar xfz result/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
+cp -a baseLocation/plugins/* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 #wrapper
 install -d $RPM_BUILD_ROOT%{_bindir}
 cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << 'EOF'
@@ -103,6 +105,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/eclipse
 %attr(755,root,root) %{_libdir}/%{name}/eclipse
+%attr(755,root,root) %{_libdir}/%{name}/lib*.so
 %{_desktopdir}/eclipse.desktop
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
@@ -113,6 +116,8 @@
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
+%{_libdir}/%{name}/about.html
+%{_libdir}/%{name}/about_files
 %dir %{_libdir}/%{name}/features
 %{_libdir}/%{name}/features/org.eclipse.jdt_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.jdt.source_*.*.*
@@ -131,33 +136,46 @@
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.boot_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.*_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*.jar
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.variables_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.base_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*.*.*
+#%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*.*.*
+#%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jface_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jface.text_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*.*.*
@@ -167,14 +185,14 @@
 %{_libdir}/%{name}/plugins/org.eclipse.pde_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.build_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.core_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*.*.*
+#%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.source_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*.*.*
+#%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*.*.*
+#%{_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_*.*.*
@@ -185,6 +203,8 @@
 %{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
@@ -201,8 +221,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.views_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
@@ -212,6 +234,7 @@
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.junit4_*.*.*
 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/features
@@ -224,6 +247,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2006/04/21 22:46:31  arekm
+- more updates (build/install/files)
+
 Revision 1.55  2006/04/21 18:45:42  arekm
 - start playing with 3.2; 3.1 is on ECLIPSE_3_1 branch
 
================================================================

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

More information about the pld-cvs-commit mailing list