diff --git a/.devtoolset-3-eclipse-emf.metadata b/.devtoolset-3-eclipse-emf.metadata index 6e3b02b..e50e27e 100644 --- a/.devtoolset-3-eclipse-emf.metadata +++ b/.devtoolset-3-eclipse-emf.metadata @@ -1 +1 @@ -9bbb92a6ea7439d993328d39227579dfac079048 SOURCES/org.eclipse.emf-R2_10_0.tar.bz2 +e8c23548369dfbdfb089683ad9b96d8c39e071f0 SOURCES/org.eclipse.emf-R2_10_2.tar.bz2 diff --git a/.gitignore b/.gitignore index 1983433..58a35a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.emf-R2_10_0.tar.bz2 +SOURCES/org.eclipse.emf-R2_10_2.tar.bz2 diff --git a/SPECS/eclipse-emf.spec b/SPECS/eclipse-emf.spec index 465d618..6bc046b 100644 --- a/SPECS/eclipse-emf.spec +++ b/SPECS/eclipse-emf.spec @@ -1,72 +1,78 @@ %{?scl:%scl_package eclipse-emf} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} +%{?java_common_find_provides_and_requires} -%if 0%{?rhel} >= 6 +# The core sub-package must be archful because it is required to be in +# libdir by the platform, but we have no natives, so suppress debuginfo %global debug_package %{nil} -%endif -# Enable when building without Eclipse in buildroot -%global bootstrap 0 -%global eclipse_dropin %{_datadir}/eclipse/dropins -%global git_tag R2_10_0 -%global context_qualifier v20140625-1130 +%global eclipse_dropin %{_datadir}/eclipse/dropins +%global git_tag R2_10_2 -%define __requires_exclude osgi* +%global __requires_exclude osgi* Name: %{?scl_prefix}eclipse-emf -Version: 2.10.0 -Release: 1.1%{?dist} +Version: 2.10.2 +Release: 2%{?dist} Summary: Eclipse Modeling Framework (EMF) Eclipse plug-in -License: EPL -URL: https://projects.eclipse.org/projects/modeling.emf.emf +License: EPL +URL: http://www.eclipse.org/modeling/emf/ Source0: http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{git_tag}.tar.bz2 # look inside correct directory for platform docs -Patch0: %{pkg_name}-platform-docs-location.patch +Patch0: eclipse-emf-platform-docs-location.patch # Build docs correctly -Patch1: %{pkg_name}-build-docs.patch -Patch2: %{pkg_name}-fix-missing-index.patch - -BuildArch: noarch - -BuildRequires: java-devel -BuildRequires: jpackage-utils -%if 0%{?rhel} < 7 -BuildRequires: %{maven_scl_prefix}ant -%endif -BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.4.0 -BuildRequires: dos2unix -Requires: jpackage-utils -Requires: %{?scl_prefix}eclipse-platform >= 1:4.4.0 -Requires: %{name}-core - -# the SDO sub-project was terminated upstream and removed in EMF 2.5 (see eclipse.org bug #251402) -Obsoletes: %{name}-sdo < 2.5 -Obsoletes: %{name}-sdo-sdk < 2.5 +Patch1: eclipse-emf-build-docs.patch +Patch2: eclipse-emf-fix-missing-index.patch -#TODO: ODA, GWT and RAP components are not packaged. +BuildRequires: java-devel +BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.4.0 %description The Eclipse Modeling Framework (EMF) allows developers to build tools and other applications based on a structured data model. From a model -specification described in XMI, EMF provides tools and runtime support to +specification described in XMI, EMF provides tools and run-time support to produce a set of Java classes for the model, along with a set of adapter classes that enable viewing and command-based editing of the model, and a basic editor. +# TODO: ODA, GWT and RAP components are not packaged. + %package core Epoch: 1 Summary: Eclipse EMF Core +Requires: java +Requires: %{?scl_prefix}eclipse-filesystem +Obsoletes: %{name}-core < 1:%{version}-%{release} %description core -The core of Eclipse Modeling Framework (EMF) plug-in. - +EMF bundles required by eclipse-platform. + +%package runtime +Summary: Eclipse Modeling Framework (EMF) Eclipse plug-in +Requires: %{?scl_prefix}eclipse-platform >= 1:4.4.0 + +# Obsoletes/provides added in F22 +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} + +BuildArch: noarch + +%description runtime +The Eclipse Modeling Framework (EMF) allows developers to build tools and +other applications based on a structured data model. From a model +specification described in XMI, EMF provides tools and run-time support to +produce a set of Java classes for the model, along with a set of adapter +classes that enable viewing and command-based editing of the model, and a +basic editor. + %package sdk Summary: Eclipse EMF SDK Requires: %{?scl_prefix}eclipse-pde >= 1:4.4.0 -Requires: %{name} = %{version}-%{release} +Requires: %{name}-runtime = %{version}-%{release} + +BuildArch: noarch %description sdk Documentation and developer resources for the Eclipse Modeling Framework @@ -76,15 +82,17 @@ Documentation and developer resources for the Eclipse Modeling Framework Summary: Eclipse EMF examples Requires: %{name}-sdk = %{version}-%{release} +BuildArch: noarch + %description examples -Installable versions of the example projects from the SDKs that demonstrate how -to use the Eclipse Modeling Framework (EMF) plug-ins. +Install-able versions of the example projects from the SDKs that demonstrate +how to use the Eclipse Modeling Framework (EMF) plug-ins. %prep %setup -q -n org.eclipse.emf-%{git_tag} -find -name *.jar -exec rm -rf {} \; -find -name *.class -exec rm -rf {} \; +find . -type f -name "*.jar" -exec rm {} \; +find . -type f -name "*.class" -exec rm {} \; %patch0 %patch1 @@ -93,107 +101,51 @@ find -name *.class -exec rm -rf {} \; mv {features,plugins,doc,examples}/* . rm -rf features plugins doc examples +# Fix spurious exec perms on license +chmod 0644 org.eclipse.emf.license-feature/rootfiles/epl-v10.html + %build -%if 0%{?rhel} < 7 -%{?scl:scl enable %{maven_scl} - << "EOF"} -%endif # Note: We use forceContextQualifier because the docs plugins use custom build # scripts and don't work otherwise. -OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=%{context_qualifier}" +OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=$(date +v%Y%m%d-%H00)" # Work around pdebuild entering/leaving symlink it is unaware of. ln -s %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license-feature \ %{_builddir}/org.eclipse.emf-%{git_tag}/org.eclipse.emf.license -# We build the features seperately, rather than just building the "all" -# feature, because it makes the files section easier to maintain -# (i.e. we don't have to know when upstream adds a new plugin) - -# build core features -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS" - -# build emf features - order is important -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core" -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core" - -# build examples features -%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core" -%if 0%{?rhel} < 7 +# Build core & runtime features, docs & source features, example features +%{?scl:scl enable %{scl} - < - 2.10.0-1.1 -- Drop conflicting obsoletes +* Tue Apr 07 2015 Mat Booth - 2.10.2-2 +- Resolves: rhbz#1208867 - Fix upgrade path from DTS30 -* Wed Jun 25 2014 Mat Booth - 2.10.0-1 -- Update to latest upstream release -- Fix obsoletes on emf-core package, rhbz #1095431 -- Move edit plugin from core to main package +* Wed Mar 04 2015 Mat Booth - 2.10.2-1 +- Update to Luna SR2 release + +* Wed Jan 14 2015 Mat Booth - 2.10.1-3.3 +- Related: rhbz#1175105 - Rebuild to fix disttag + +* Fri Jan 09 2015 Mat Booth - 2.10.1-3.2 +- Related: rhbz#1175105 - Don't use java-headless + +* Wed Jan 07 2015 Mat Booth - 2.10.1-3.1 +- Resolves: rhbz#1175105 - Import into DTS 3.1 -* Mon May 26 2014 Roland Grunberg - 2.9.2-4 -- Use %%{maven_scl}ant for build due to issues with DTS 3.0 ant. +* Thu Nov 20 2014 Mat Booth - 2.10.1-3 +- Qualifier must be same on all arches in archful builds -* Fri May 23 2014 Sami Wagiaalla - 2.9.2-3 -- Build the full emf package. +* Wed Nov 19 2014 Mat Booth - 2.10.1-2 +- Make core package archful so it can be installed into libdir + where eclipse-platform expects it to be +- Move eclipse-emf -> eclipse-emf-runtime, this is because we can have + noarch sub-packages of an archful package, but cannot have archful + sub-packages of a noarch package +- Fix some minor rpmlint errors -* Mon May 19 2014 Roland Grunberg - 2.9.2-3.2 -- Package necessary features. +* Wed Oct 01 2014 Mat Booth - 2.10.1-1 +- Update to Luna SR1 release +- Drop ancient obsoletes on emf-sdo package -* Mon May 19 2014 Roland Grunberg - 2.9.2-2.2 -- Make additional changes to SCL-ization. +* Wed Jun 25 2014 Mat Booth - 2.10.0-1 +- Update to latest upstream release +- Fix obsoletes on emf-core package, rhbz #1095431 +- Move edit plugin from core to main package -* Thu May 15 2014 Roland Grunberg - 2.9.2-2.1 -- Make changes to get emf core built on DTS 3.0. +* Sat Jun 07 2014 Fedora Release Engineering - 2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Thu Apr 17 2014 Mat Booth - 2.9.2-2 - Drop XSD packages, these are now packaged separately @@ -314,11 +281,11 @@ popd - Bugs 812870, 812872 - fix building index for documentation. * Tue Apr 10 2012 Krzysztof Daniel 2.8.0-0.5.postM6 -- Remove %clean section. +- Remove %%clean section. - Remove duplicated plugins. * Mon Apr 2 2012 Krzysztof Daniel 2.8.0-0.4.postM6 -- Use %{bindir}/eclipse-pdebuild. +- Use %%{bindir}/eclipse-pdebuild. * Thu Mar 29 2012 Krzysztof Daniel 2.8.0-0.3.postM6 - Back noarch.