diff --git a/eclipse.spec b/eclipse.spec index 80a4914..1c6fe9b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -8,6 +8,8 @@ Epoch: 1 %global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/ %global eb_sha1 9bf99aad0f4c76d5936616bd9612d6238b8468f0 %global build_id fa15ab +%global eclipse_version %{eclipse_majmin}.%{eclipse_micro} +%global emf_version 2.8.0 # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. @@ -17,13 +19,13 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.2.fa15ab%{?dist} +Version: %{eclipse_version} +Release: 0.3.fa15ab%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ Source0: %{download_url}eclipse-build-%{eb_sha1}.tar.xz -Source1: %{download_url}eclipse-%{version}-%{build_id}-src.tar.bz2 +Source1: %{download_url}eclipse-%{eclipse_version}-%{build_id}-src.tar.bz2 Source2: eclipse-reconciler.sh Source4: macros.%{name} Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom @@ -87,6 +89,7 @@ environments (IDEs), server-side applications, desktop applications, and everything in between. %package swt +Version: %{eclipse_version} Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) # %{_libdir}/java directory owned by jpackage-utils @@ -98,31 +101,33 @@ Requires: webkitgtk SWT Library for GTK+-2.0. %package -n eclipse-emf-core -Version: 2.8 +Version: %{emf_version} Summary: Eclipse Modeling Framework Core Group: Development/Languages Conflicts: eclipse-emf < 2.8.0 -%description emf-core +%description -n eclipse-emf-core Eclipse Modeling Framework Core %package rcp +Version: %{eclipse_version} Summary: Eclipse Rich Client Platform Group: Development/Languages -Requires: %{name}-swt = %{epoch}:%{version}-%{release} +Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} Requires: icu4j-eclipse >= 1:4.4.2.2-11 Requires: java >= 1.6.0 -Requires: %{name}-emf-core +Requires: %{name}-emf-core = %{epoch}:%{emf_version}-%{release} Provides: osgi(system.bundle) %description rcp Eclipse Rich Client Platform %package platform +Version: %{eclipse_version} Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-rcp = %{epoch}:%{version}-%{release} +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 @@ -142,7 +147,7 @@ Requires: sac Requires: xml-commons-apis Requires: batik Requires: atinject -Provides: eclipse-cvs-client = 1:%{version}-%{release} +Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 %description platform @@ -151,10 +156,11 @@ Java Development Tools or the Plugin Development Environment. %package jdt +Version: %{eclipse_version} Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} +Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release} Requires: junit >= 4.10-4 Requires: jakarta-commons-httpclient Requires: java-javadoc @@ -165,18 +171,19 @@ Eclipse Java Development Tools. This package is required to use Eclipse for developing software written in the Java programming language. %package pde +Version: %{eclipse_version} Summary: Eclipse Plugin Development Environment Group: Text Editors/Integrated Development Environments (IDE) -Provides: eclipse = %{epoch}:%{version}-%{release} -Provides: eclipse-sdk = %{epoch}:%{version}-%{release} -Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: %{name}-jdt = %{epoch}:%{version}-%{release} +Provides: eclipse = %{epoch}:%{eclipse_version}-%{release} +Provides: eclipse-sdk = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} Requires: objectweb-asm >= 3.3.1-1 Requires: hamcrest >= 0:1.1-9.2 # For PDE Build wrapper script + creating jars Requires: zip Requires: bash -Provides: %{name}-pde-runtime = 1:%{version}-%{release} +Provides: %{name}-pde-runtime = 1:%{eclipse_version}-%{release} Obsoletes: %{name}-pde-runtime < 1:3.3.2-20 %description pde @@ -188,7 +195,7 @@ export JAVA_HOME=%{java_home} %setup -q -n eclipse-build-%{eb_sha1} cp %{SOURCE1} . ant applyPatches -pushd build/eclipse-%{eclipse_majmin}.%{eclipse_micro}-%{build_id}-src +pushd build/eclipse-%{eclipse_version}-%{build_id}-src # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) @@ -648,6 +655,9 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog +* Thu Mar 29 2012 Krzysztof Daniel 1:4.2.0-0.3.fa15ab +- Sort out problems with versions. + * Thu Mar 29 2012 Krzysztof Daniel 1:4.2.0-0.2.fa15ab - Change eclipse-emf-core package version to 2.8