rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove build artifacts from P2 files.

Browse Source
This commit is contained in:
Krzysztof Daniel 2012-09-20 16:23:37 +02:00
parent 27576df6a2
commit 8a5ee96acd
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eclipse-build-network-native-libs.patch
View File

@ -146,6 +146,12 @@
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
--
1.7.10.4
--- 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 @@
#include <jni.h>
#include <glib.h>
-#include <glib/gslist.h>
#include <gconf/gconf-value.h>
#include <gconf/gconf-client.h>

24
eclipse.spec
View File

@ -37,7 +37,7 @@ ln -s %{_javadir}/%{2} ${_f}
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 0.2%{?dist}
Release: 0.3%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -415,6 +415,11 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch32
%patch33
#p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
#http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/org.fedoraproject.eclipse.platform.p2.inf
#To save build hdd space (it took more than 10GB to build everything)
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
@ -778,7 +783,20 @@ for i in `ls | grep "profile.gz"` ; do \
gzip *.profile ; \
done
# TODO: some other paths
popd
#delete all local repositories. We want to have only "original" by default.
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/.settings
sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
popd
#clean cache
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.core/cache
rm -rf *
popd
#installation itself - copy it into right location
@ -1237,6 +1255,10 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
* Thu Sep 20 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-0.3
- Remove build artifacts from P2 files.
- Fix native gnome-proxy build.
* Wed Sep 19 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-0.2
- Build the jdt.debug.launching internal jar.