[eclipse/f18] Delete the patch that dropped a user profile (unwanted side effects). Move sytem.bundle to equinox p
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Oct 19 15:17:47 UTC 2012
commit 2cf254c253961eaddf36564d2e6854e7e17b863b
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Oct 19 17:07:20 2012 +0200
Delete the patch that dropped a user profile (unwanted side effects).
Move sytem.bundle to equinox package.
Fix building of core.net on secondary arches.
Removed recursive dependency to eclipse-rcp.
eclipse-build-network-native-libs.patch | 15 +----
eclipse-drop-user-profile-on-platform-change.patch | 32 --------
eclipse-improve-core-net-makefile.patch | 77 ++++++++++++++++++++
eclipse.spec | 18 +++--
4 files changed, 89 insertions(+), 53 deletions(-)
---
diff --git a/eclipse-build-network-native-libs.patch b/eclipse-build-network-native-libs.patch
index bf3b854..7ea0dba 100644
--- a/eclipse-build-network-native-libs.patch
+++ b/eclipse-build-network-native-libs.patch
@@ -94,9 +94,9 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
-+ <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/x86_64/"/>
++ <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+ <copy todir="." >
-+ <fileset dir="../../natives/unix/linux/x86_64/">
++ <fileset dir="../../natives/unix/linux/">
+ <include name="libgnomeproxy-*.so"/>
+ </fileset>
+ </copy>
@@ -135,17 +135,6 @@
+ </profile>
+ </profiles>
</project>
---- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
-+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
-@@ -19,7 +19,7 @@ GNOMEPROXY.O = gnomeproxy.o
- LIB_NAME = gnomeproxy.so
- LIB_NAME_FULL = libgnomeproxy-1.0.0.so
-
--OS_TYPE =
-+OS_TYPE = linux
- JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
- INCLUDE = `pkg-config --cflags gconf-2.0`
- COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-06 05:37:03.000000000 -0400
+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-17 16:12:33.000000000 -0400
@@ -13,7 +13,6 @@
diff --git a/eclipse-improve-core-net-makefile.patch b/eclipse-improve-core-net-makefile.patch
new file mode 100644
index 0000000..aeecc91
--- /dev/null
+++ b/eclipse-improve-core-net-makefile.patch
@@ -0,0 +1,77 @@
+--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig 2012-10-01 11:49:37.000000000 +0200
++++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile 2012-10-19 14:44:01.556024807 +0200
+@@ -1,5 +1,5 @@
+ #**********************************************************************
+-# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
++# Copyright (c) 2008, 2012 Oakland Software Incorporated and others.
+ # All rights reserved. This program and the accompanying materials
+ # are made available under the terms of the Eclipse Public License v1.0
+ # which accompanies this distribution, and is available at
+@@ -20,11 +20,11 @@
+
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
++INCLUDE = `pkg-config --cflags gconf-2.0`
++COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
+
+-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+-LINKER_FLAGS= -m32
++LIBS := `pkg-config --libs gconf-2.0`
++LINKER_FLAGS= ${TARGET_ENVIRONMENT}
+
+ all: link
+
+--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile 2012-10-01 11:49:37.000000000 +0200
++++ /dev/null 2012-10-13 13:36:07.457201187 +0200
+@@ -1,48 +0,0 @@
+-#**********************************************************************
+-# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
+-# All rights reserved. This program and the accompanying materials
+-# are made available under the terms of the Eclipse Public License v1.0
+-# which accompanies this distribution, and is available at
+-# http://www.eclipse.org/legal/epl-v10.html
+-#
+-# Contributors:
+-# Oakland Software Incorporated - initial submission
+-# IBM Corporation - refactoring, bug 245849
+-# Tristan Tarrant - x86_64 support, bug 273072
+-#
+-#**********************************************************************
+-#
+-# makefile for libgnomeproxy-1.0.0.so
+-
+-GNOMEPROXY.C = ../../gnomeproxy.c
+-GNOMEPROXY.O = gnomeproxy.o
+-LIB_NAME = gnomeproxy.so
+-LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+-
+-OS_TYPE =
+-JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = `pkg-config --cflags gconf-2.0`
+-COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
+-
+-LIBS := `pkg-config --libs gconf-2.0`
+-LINKER_FLAGS= -m64
+-
+-all: link
+-
+-compile:
+- @echo "Building file: $(GNOMEPROXY.O)"
+- @echo "Invoking: GCC C Compiler"
+- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
+- @echo "Finished building: $(GNOMEPROXY.O)"
+- @echo " "
+-
+-link: compile
+- @echo "Building target: $(LIB_NAME_FULL)"
+- @echo "Invoking: GCC C Linker"
+- gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
+- @echo "Finished building target: $(LIB_NAME_FULL)"
+- @echo " "
+-
+-clean:
+- -$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
+- - at echo " "
+\ No newline at end of file
diff --git a/eclipse.spec b/eclipse.spec
index 3527265..6efcb9e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -78,7 +78,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -177,10 +177,6 @@ Patch16: %{name}-dont-download-old-platform-for-p2-tests.patch
Patch17: %{name}-do-not-run-as-root.patch
-# This one really needs to be updated/improved.
-Patch18: %{name}-drop-user-profile-on-platform-change.patch
-
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
Patch19: %{name}-p2-pick-up-renamed-jars.patch
@@ -234,6 +230,7 @@ Patch34: %{name}-fix-linkageerrors-in-ui.patch
Patch35: %{name}-secondary-arches.patch
+Patch36: %{name}-improve-core-net-makefile.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -321,6 +318,7 @@ Version: %{eclipse_version}
Summary: Eclipse OSGi - Equinox
Requires: java >= 1:1.7.0
Requires: jpackage-utils
+Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version}
%description equinox-osgi
Eclipse OSGi - Equinox
@@ -329,7 +327,6 @@ Eclipse OSGi - Equinox
Version: %{eclipse_version}
Summary: Eclipse platform common files
Group: Development/Tools
-Requires: %{name}-rcp = %{epoch}:%{eclipse_version}-%{release}
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
Requires: ant-scripts
@@ -367,7 +364,6 @@ Provides: eclipse-cvs-client = %{epoch}:%{eclipse_version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
Obsoletes: eclipse-rcp < 1:%{eclipse_version}-%{release}
Provides: eclipse-rcp = 1:%{eclipse_version}-%{release}
-Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version}
%description platform
The Eclipse Platform is the base of all IDE plugins. This does not include the
@@ -442,7 +438,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch15
%patch16
%patch17
-%patch18
%patch19
%patch20
%patch21
@@ -462,6 +457,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch33
%patch34
%patch35
+%patch36
#p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
#http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
@@ -1409,6 +1405,12 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Fri Oct 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-5
+- Removed patch for droping user installed changes.
+- Moved Provides:osgi(system.bundle) to eclipse-equinox-osgi subpackage.
+- Removed platform dependency to eclipse-rcp.
+- Fixed building of core.net on secondary arches.
+
* Fri Oct 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-4
- Use glassfish-jsp-api instead of tomcat-jsp-api.
More information about the scm-commits
mailing list