SPECS: eclipse.spec - license updated, cleanups, removed dupe from...

Fri Jul 1 11:27:30 CEST 2005

Author: pluto                        Date: Fri Jul  1 09:27:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- license updated, cleanups, removed dupe from %%files.

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

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.46 SPECS/eclipse.spec:1.47

--- SPECS/eclipse.spec:1.46	Thu Jun 30 23:54:23 2005
+++ SPECS/eclipse.spec	Fri Jul  1 11:27:25 2005
@@ -6,12 +6,10 @@
 #			  This will make building such things like Azureus possible without having
 #			  whole Eclipse suite installed.
 #
-
 %define		_buildid	200506271435
 #define		_mver		M6
 %define		_ver_major	3.1
 %define		_ver_minor	0
-%define		_ver		%{_ver_major}.%{_ver_minor}
 #
 Summary:	Eclipse - an open extensible IDE
 Summary(pl):	Eclipse - otwarte, rozszerzalne środowisko programistyczne
@@ -19,7 +17,7 @@
 Version:	%{_ver_major}
 #Release:	0.%{_mver}_%{_buildid}.1
 Release:	0.1
-License:	CPL v1.0
+License:	EPL 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
@@ -27,7 +25,6 @@
 Source1:	%{name}.desktop
 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
@@ -60,19 +57,14 @@
 %setup -q -c
 %patch0 -p0
 %patch1 -p1
-#patch2 -p1
 
 %build
-JAVA_HOME=%{_libdir}/java
-export JAVA_HOME
+export JAVA_HOME=%{_libdir}/java
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
 
-
-
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
-#mkdir plugins/org.eclipse.core.resources.linux/os/linux/%{_eclipse_arch}
 %{__make} -C plugins/org.eclipse.core.resources.linux/src \
     CFLAGS="%{rpmcflags} $JAVA_INC" \
     LDFLAGS="%{rpmldflags}"
@@ -87,16 +79,12 @@
 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/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
@@ -124,8 +112,6 @@
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
-
-# features
 %dir %{_libdir}/%{name}/features
 %{_libdir}/%{name}/features/org.eclipse.jdt_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.jdt.source_*.*.*
@@ -136,8 +122,6 @@
 %{_libdir}/%{name}/features/org.eclipse.rcp_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.rcp.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
-
-# plugins
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/org.apache.ant_*.*.*
 %{_libdir}/%{name}/plugins/org.apache.lucene_*.*.*
@@ -150,14 +134,7 @@
 %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
-
 %{_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_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.variables_*.*.*
@@ -166,7 +143,6 @@
 %{_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.ide_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt_*.*.*
@@ -208,8 +184,6 @@
 %{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
-
-
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
@@ -233,19 +207,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.core_*.*.*
-
 %{_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
@@ -253,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/07/01 09:27:25  pluto
+- license updated, cleanups, removed dupe from %%files.
+
 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.
================================================================

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


