[eclipse] Small cleanups.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 31 12:56:05 UTC 2012
commit 71f860fb5be410b4f6a8c15a913493256708f4d1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Oct 31 14:55:59 2012 +0200
Small cleanups.
- Bump release to be bigger than F-18.
eclipse.spec | 99 ++++++++++++++++++++-------------------------------------
1 files changed, 35 insertions(+), 64 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 45e7913..a73529f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -18,23 +18,14 @@ Epoch: 1
%ifarch %{ix86}
%define eclipse_arch x86
%endif
-%ifarch x86_64
- %define eclipse_arch x86_64
-%endif
%ifarch %{arm}
%define eclipse_arch arm
%endif
%ifarch %{power64}
%define eclipse_arch ppc64
%endif
-%ifarch ppc
- %define eclipse_arch ppc
-%endif
-%ifarch s390x
- %define eclipse_arch s390x
-%endif
-%ifarch s390
- %define eclipse_arch s390
+%ifarch s390 s390x ppc x86_64
+ %define eclipse_arch %{_arch}
%endif
@@ -78,7 +69,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 9%{?dist}
+Release: 11%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -96,40 +87,32 @@ Source2: macros.%{name}
# +org.apache.lucene.core
Patch0: %{name}-help-feature-adjust-dependencies.patch
-
# -org.w3c.dom.smil
# -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch
-
# recent icu has changed it's id. Eclipse Foundation ignores that.
# com.ibm.icu.base -> com.ibm.icu
Patch3: %{name}-fix-icu-import.patch
-
# Eclipse should not duplicate dependency sources (which are delivered
# by those dependencies packages).
Patch4: %{name}-no-source-for-dependencies.patch
-
# +org.apache.jasper
# +org.apache.commons.el
Patch5: %{name}-osgi-serverside-patch-additional-imports.patch
-
# We don't need it
Patch6: %{name}-remove-jaas.patch
-
# javax.servlet 2.1 -> javax.servlet 3.0
Patch7: %{name}-fix-equinox-ip-imports.patch
-
# This has too many dependencies. We will not build it.
Patch8: %{name}-remove-weaving.patch
-
# We don't want to ship sources for bundles that come as a separate package.
# -org.eclipse.ecf.source
# -org.eclipse.ecf.filetransfer.source
@@ -148,56 +131,43 @@ Patch9: %{name}-fix-master-ecf.patch
# -org.apache*
Patch10: %{name}-fix-master-equinox.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=385970
Patch11: %{name}-osgi-unpack-sources.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388120
Patch12: %{name}-fix-debug-ui.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=384873
Patch13: %{name}-fix-compatibility-class.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388157
Patch14: %{name}-fix-pde-ui-compilation.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388159
Patch15: %{name}-fix-transforms.patch
-
# No comment here. Don't download. Period.
Patch16: %{name}-dont-download-old-platform-for-p2-tests.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=379102
Patch17: %{name}-do-not-run-as-root.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
Patch19: %{name}-p2-pick-up-renamed-jars.patch
-
# Patch for this was contributed. Unlikely to be released.
Patch20: %{name}-ignore-version-when-calculating-home.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=249133
Patch21: %{name}-populate-update-sites-from-master.patch
-
# CBI uses timestamps generated from the git commits. We don't have the repo,
# just source, and we don't want additional dependencies.
Patch22: %{name}-remove-jgit-provider.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=388162
Patch23: %{name}-fix-comilation-lucene-3.6-compile.patch
-
# This is for Fedora purposes to have working eclipse-pdebuild script.
Patch24: %{name}-pdebuild-add-target.patch
@@ -213,7 +183,6 @@ Patch26: %{name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
Patch27: %{name}-build-filesystem-native-libs.patch
-
Patch28: %{name}-build-help-contents.patch
Patch29: %{name}-test-support.patch
@@ -232,25 +201,25 @@ Patch35: %{name}-secondary-arches.patch
Patch36: %{name}-improve-core-net-makefile.patch
-BuildRequires: ant >= 1.8.3
-BuildRequires: rsync
-BuildRequires: jpackage-utils >= 0:1.5, make, gcc
-BuildRequires: gtk2-devel
-BuildRequires: glib2-devel
-BuildRequires: gcc-c++
-BuildRequires: nspr-devel
-BuildRequires: libXtst-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-BuildRequires: cairo >= 1.0
-BuildRequires: unzip
-BuildRequires: coreutils
-BuildRequires: desktop-file-utils
-BuildRequires: java-devel >= 1:1.7.0
-BuildRequires: java-javadoc >= 1:1.7.0
-BuildRequires: libXt-devel
-BuildRequires: webkitgtk-devel
-BuildRequires: geronimo-annotation >= 1.0-7
+BuildRequires: ant >= 1.8.3
+BuildRequires: rsync
+BuildRequires: jpackage-utils >= 0:1.5, make, gcc
+BuildRequires: gtk2-devel
+BuildRequires: glib2-devel
+BuildRequires: gcc-c++
+BuildRequires: nspr-devel
+BuildRequires: libXtst-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: cairo >= 1.0
+BuildRequires: unzip
+BuildRequires: coreutils
+BuildRequires: desktop-file-utils
+BuildRequires: java-devel >= 1:1.7.0
+BuildRequires: java-javadoc >= 1:1.7.0
+BuildRequires: libXt-devel
+BuildRequires: webkitgtk-devel
+BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
BuildRequires: 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
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
@@ -408,9 +377,7 @@ developing Eclipse plugins.
Version: %{eclipse_version}
Summary: Eclipse Tests
Group: Development/Tools
-Requires: %{name}-sdk = %{epoch}:%{eclipse_version}-%{release}
-Provides: %{name}-pde-runtime = 1:%{eclipse_version}-%{release}
-Obsoletes: %{name}-pde-runtime < 1:3.3.2-20
+Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
%description tests
Eclipse Tests.
@@ -580,12 +547,12 @@ currentDir=`pwd`
pushd repo/emf/eclipse/plugins
ln -s %{_javadir}/hamcrest/core.jar
- cd org.junit_3.8.2.v3_8_2_v20100427-1100
+ pushd org.junit_3.8.2.v3_8_2_v20100427-1100
ln -s %{_javadir}/junit.jar
- cd ..
+ popd
zip -r org.junit_3.8.2.v3_8_2_v20100427-1100.jar org.junit_3.8.2.v3_8_2_v20100427-1100
-cd org.apache.ant_1.8.3.v20120321-1730
+pushd org.apache.ant_1.8.3.v20120321-1730
mkdir -p lib
pushd lib
#rm *
@@ -620,7 +587,7 @@ mkdir -p bin
ln -s /usr/bin/runant.py runant.py
ln -s /usr/bin/complete-ant-cmd.pl complete-and-cmd.pl
popd
-cd ..
+popd
zip -r org.apache.ant_1.8.3.v20120321-1730.jar org.apache.ant_1.8.3.v20120321-1730
cd ../..
unzip %{_javadir}/tycho/tycho-bundles-external.zip
@@ -869,9 +836,9 @@ rm -rf configuration/org.eclipse.update/*
find configuration -type d -name "data" -exec rm -rf `pwd`{} \;
find configuration -type f -name "*.log" -exec rm `pwd`{} \;
-cd configuration/org.eclipse.osgi
+pushd configuration/org.eclipse.osgi
rm -rf .bundledata* .lazy* .manager .state*
-cd ../..
+popd
#symlink jdt & sdk
pushd dropins/jdt/plugins
@@ -879,10 +846,10 @@ pushd dropins/jdt/plugins
rm -f $f
ln -s %{_javadir}/hamcrest/core.jar $f
- cd org.junit_3.8.2.*
+ pushd org.junit_3.8.2.*
rm -f junit.jar
ln -s /usr/share/java/junit.jar
- cd ..
+ popd
rm -rf org.junit_4*
ln -s /usr/share/java/junit.jar
@@ -1408,6 +1375,10 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Wed Oct 31 2012 Alexander Kurtakov <akurtako at redhat.com> 1:4.2.1-11
+- Small cleanups.
+- Bump release to be bigger than F-18.
+
* Wed Oct 24 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-9
- Make the removal of the icon more error prone.
More information about the scm-commits
mailing list