SPECS: eclipse.spec - really insertBuildId - launcher patches from...

[glen]

Author: glen                         Date: Sun Dec  2 12:01:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- really insertBuildId
- launcher patches from FC (NFY)

---- Files affected:
SPECS:
   eclipse.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.92 SPECS/eclipse.spec:1.93
--- SPECS/eclipse.spec:1.92	Sat Dec  1 14:32:47 2007
+++ SPECS/eclipse.spec	Sun Dec  2 13:01:43 2007
@@ -5,20 +5,22 @@
 #   This will make building such things like Azureus possible without having
 #   whole Eclipse suite installed.
 # - there are unpackaged source files, -devel?
-#
+
 %define		ver_major	3.3.1.1
 %define		buildid	200710231652
-#
+
 Summary:	Eclipse - an open extensible IDE
 Summary(pl.UTF-8):	Eclipse - otwarte, rozszerzalne środowisko programistyczne
 Name:		eclipse
 Version:	%{ver_major}
-Release:	1
+Release:	1.2
 License:	EPL v1.0
 Group:		Development/Tools
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/%{name}-sourceBuild-srcIncluded-%{ver_major}.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/%{name}-sourceBuild-srcIncluded-%{version}.zip
 # Source0-md5:	593b56fce7d1f1f799e87365cafefbef
 Source1:	%{name}.desktop
+Patch0:		%{name}-launcher-set-install-dir-and-shared-config.patch
+Patch1:		%{name}-launcher-double-free-bug.patch
 URL:		http://www.eclipse.org/
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	ant-apache-regexp
@@ -54,7 +56,19 @@
 %setup -q -c
 
 # Build Id - it's visible in couple places in GUI
-%{__sed} -e 's,buildId=.*,& (PLD Linux %{name}-%{version}-%{release}),' label.properties
+%{__sed} -i -e 's,buildId=.*,& (PLD Linux %{name}-%{version}-%{release}),' label.properties
+
+# launcher patches
+rm plugins/org.eclipse.platform/launchersrc.zip
+cd features/org.eclipse.equinox.executable
+%patch0 -p0
+%patch1 -p0
+# put the configuration directory in an arch-specific location
+sed -i -e 's:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:' library/eclipse.c
+# make the eclipse binary relocatable
+sed -i -e 's:/usr/share/eclipse:%{_datadir}/%{name}:' library/eclipse.c
+zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
+cd -
 
 %build
 unset CLASSPATH || :
@@ -62,6 +76,8 @@
 
 ./build -os linux -ws gtk -arch %{eclipse_arch} -target compile
 
+%ant insertBuildId
+
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
 %{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
@@ -304,6 +320,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2007-12-02 12:01:43  glen
+- really insertBuildId
+- launcher patches from FC (NFY)
+
 Revision 1.92  2007-12-01 13:32:47  glen
 - circuits in %install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eclipse.spec?r1=1.92&r2=1.93&f=u