[eclipse-emf/f19] Update to latest upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed May 1 14:03:06 UTC 2013
commit 02dcde613ffc047f47f3016eaa2aa0ecbdb85f71
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed May 1 16:03:00 2013 +0200
Update to latest upstream.
.gitignore | 2 +
eclipse-emf-bundle-examples.patch | 138 -------------------------------------
eclipse-emf.spec | 104 +++++++++++++++-------------
get-emf.sh | 8 +-
sources | 2 +-
5 files changed, 62 insertions(+), 192 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e0c5bac..5c2f8cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ emf-2.6.1.tar.gz
emf-2.8.0.tar.gz
/emf-2.8.1.tar.gz
/emf-2.8.1
+/emf-2.9.0
+/emf-352e289de46b6cb684e3b5c6514d95c1c591f405.tar.gz
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index cdccc04..5a71d97 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -1,13 +1,19 @@
+%{?scl:%scl_package eclipse-emf}
+%{!?scl:%global pkg_name %{name}}
+
+
%if 0%{?rhel} >= 6
%global debug_package %{nil}
%endif
%global eclipse_dropin %{_datadir}/eclipse/dropins
+%global emf_tag 352e289de46b6cb684e3b5c6514d95c1c591f405
+
%define __requires_exclude osgi*
-Name: eclipse-emf
-Version: 2.8.1
-Release: 7%{?dist}
+Name: %{?scl_prefix}eclipse-emf
+Version: 2.9.0
+Release: 0.1.git352e28%{?dist}
Summary: Eclipse Modeling Framework (EMF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -16,36 +22,30 @@ URL: http://www.eclipse.org/modeling/emf/
# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-emf.sh
-Source0: emf-%{version}.tar.gz
+Source0: emf-%{emf_tag}.tar.gz
Source1: get-emf.sh
# don't depend on ANT_HOME and JAVA_HOME environment vars, patch upstream
#Patch0: %{name}-make-homeless.patch
# look inside correct directory for platform docs
-Patch1: %{name}-platform-docs-location.patch
-# bundle examples in example-installer plugins from source in tarball instead of from cvs
-Patch2: %{name}-bundle-examples.patch
+Patch1: %{pkg_name}-platform-docs-location.patch
# Build docs correctly
-Patch3: %{name}-build-docs.patch
+Patch3: %{pkg_name}-build-docs.patch
# Remove xsd2ecore components from SDK, they are not in the main feature
-Patch4: %{name}-no-xsd2ecore.patch
-Patch5: %{name}-fix-missing-index.patch
+Patch4: %{pkg_name}-no-xsd2ecore.patch
+Patch5: %{pkg_name}-fix-missing-index.patch
-%if 0%{?rhel} >= 6
-ExclusiveArch: %{ix86} x86_64
-%else
BuildArch: noarch
-%endif
# we require 1.6.0 because the javadocs fail to build otherwise
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: java-javadoc
BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:4.2.0
+BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.2.0
BuildRequires: dos2unix
Requires: java
Requires: jpackage-utils
-Requires: eclipse-platform >= 1:4.2.0
+Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.0
Requires: %{name}-core
# the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837)
@@ -71,8 +71,7 @@ Epoch: 1
Summary: Eclipse EMF Core
Group: System Environment/Libraries
Requires: java
-#Obsoletes: eclipse-emf-core < 1:2.8.0-10
-#This package has been moved into main eclipse package
+Obsoletes: eclipse-emf-core < 1:2.8.0-20
%description core
The core of Eclipse Modeling Framework
@@ -81,7 +80,7 @@ The core of Eclipse Modeling Framework
Summary: Eclipse EMF SDK
Group: System Environment/Libraries
Requires: java-javadoc
-Requires: eclipse-pde >= 1:4.2.0
+Requires: %{?scl_prefix}eclipse-pde >= 1:4.2.0
Requires: %{name} = %{version}-%{release}
%description sdk
@@ -102,7 +101,7 @@ representation of XML Schema as a series of XML documents.
Summary: Eclipse XSD SDK
Group: System Environment/Libraries
Requires: java-javadoc
-Requires: eclipse-pde >= 1:4.2.0
+Requires: %{?scl_prefix}eclipse-pde >= 1:4.2.0
Requires: %{name}-xsd = %{version}-%{release}
Requires: %{name}-sdk = %{version}-%{release}
@@ -123,7 +122,8 @@ plugins.
%prep
%setup -q -n emf-%{version}
%patch1 -p0 -b .orig
-%patch2 -p1 -b .orig
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=406981
+#%patch2 -p1 -b .orig
%patch3 -p1 -b .orig
%patch4 -p1 -b .orig
%patch5
@@ -151,7 +151,7 @@ fi
%build
# 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=v20120911-0500"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20130501-1417"
# Work around pdebuild entering/leaving symlink it is unaware of.
ln -s %{_builddir}/emf-%{version}/org.eclipse.emf.license-feature %{_builddir}/emf-%{version}/org.eclipse.emf.license
@@ -162,39 +162,39 @@ ln -s %{_builddir}/emf-%{version}/org.eclipse.xsd.license-feature %{_builddir}/e
# maintain (i.e. we don't have to know when upstream adds a new plugin)
# build core features
-eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
+%{_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
-eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+%{_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 xsd features
-eclipse-pdebuild -f org.eclipse.xsd -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS" -d "eclipse-emf-core"
-eclipse-pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS" -d "eclipse-emf-core"
# build examples features
-eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
+%{_bindir}/eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
%install
install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -274,6 +274,12 @@ popd
%{eclipse_dropin}/emf-examples
%changelog
+* Wed May 1 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:2.9.0-0.1.git352e28
+- Update to latest upstream.
+
+* Thu Mar 21 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.1-20
+- Initial SCLization.
+
* Mon Jan 28 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.1-7
- Really fix RHBZ#894154.
diff --git a/get-emf.sh b/get-emf.sh
index a38231f..286a431 100755
--- a/get-emf.sh
+++ b/get-emf.sh
@@ -1,9 +1,9 @@
#!/bin/sh
#actual tag to checkout
-TAG=14eb839f5e2829d072db6e0e023d28e67e585b7e
-XSD_TAG=9533f3f75c2b3e33b767fb653f47c00f8b3b896c
+TAG=352e289de46b6cb684e3b5c6514d95c1c591f405
+XSD_TAG=c860d460e73dab7cdcfefe8ce4a37b751273cb4d
#name of the version to put in the source
-VERSION=2.8.1
+VERSION=2.9.0
rm -rf org.eclipse.emf
rm -rf org.eclipse.xsd
@@ -25,7 +25,7 @@ popd
mkdir emf-$VERSION/
mv org.eclipse.emf/{doc,examples,features,plugins,tests}/* emf-$VERSION/
cp -fr org.eclipse.xsd/{doc,examples,features,plugins}/* emf-$VERSION/
-tar czf emf-$VERSION.tar.gz emf-$VERSION
+tar czf emf-$TAG.tar.gz emf-$VERSION
rm -rf org.eclipse.emf
rm -rf org.eclipse.xsd
diff --git a/sources b/sources
index 591da61..2501e60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11ce5438270f0a848a3e94d682758e3d emf-2.8.1.tar.gz
+099fb77dee7e76fdd3a93c3ff0b5080a emf-352e289de46b6cb684e3b5c6514d95c1c591f405.tar.gz
More information about the scm-commits
mailing list