[eclipse-gef/eclipse-luna: 1/3] SCL-ise
Mat Booth
mbooth at fedoraproject.org
Tue Sep 30 09:22:18 UTC 2014
commit 8483c9d0666531c4770fb21b6185ff746f5eea93
Author: Mat Booth <mat.booth at redhat.com>
Date: Fri Jul 18 12:00:09 2014 +0100
SCL-ise
eclipse-gef.spec | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index c95e5a7..2f90fe9 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -1,3 +1,6 @@
+%{?scl:%scl_package eclipse-gef}
+%{!?scl:%global pkg_name %{name}}
+
%global eclipse_dropin %{_datadir}/eclipse/dropins
# There is no tag in the upstream repository, but this revision
@@ -5,10 +8,10 @@
# is sort of a "post-release snapshot"
%global git_version b63ec56b20b75fc5af90fbb1e85911bed35997dc
-Name: eclipse-gef
+Name: %{?scl_prefix}eclipse-gef
Version: 3.9.100
-Release: 1.gitb63ec56%{?dist}
+Release: 1.gitb63ec56.1%{?dist}
Summary: Graphical Editing Framework (GEF) Eclipse plug-in
Group: System Environment/Libraries
License: EPL
@@ -21,11 +24,11 @@ Source1: get-gef.sh
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: tycho
-BuildRequires: eclipse-pde >= 1:4.4.0
-BuildRequires: eclipse-license
+BuildRequires: %{?scl_prefix}tycho
+BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.4.0
+BuildRequires: %{?scl_prefix}eclipse-license
BuildRequires: ant-contrib
-Requires: eclipse-platform >= 1:4.4.0
+Requires: %{?scl_prefix}eclipse-platform >= 1:4.4.0
%description
The Graphical Editing Framework (GEF) allows developers to create a rich
@@ -37,7 +40,7 @@ class diagram editors, state machines, and even WYSIWYG text editors.
%package sdk
Summary: Eclipse GEF SDK
Group: System Environment/Libraries
-Requires: eclipse-pde >= 1:4.4.0
+Requires: %{?scl_prefix}eclipse-pde >= 1:4.4.0
Requires: %{name} = %{version}-%{release}
%description sdk
@@ -58,8 +61,14 @@ to use the Eclipse Graphical Editing Framework (GEF) plug-in.
find -name *.jar -exec rm -rf {} \;
find -name *.class -exec rm -rf {} \;
+# Not sure why this is needed yet...
+mkdir -p .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0
+cp %{_javadir}/tycho/tycho-bundles-external.zip .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0/tycho-bundles-external-0.20.0.zip
+
%build
+%{?scl:scl enable %{scl} - << "EOF"}
xmvn -o clean verify -f org.eclipse.gef.releng/pom.xml -Dmaven.test.skip=true -P !LUNA_4_4.target
+%{?scl:EOF}
pushd org.eclipse.gef.repository/target/repository/features/
for f in `ls`; do \
@@ -122,6 +131,9 @@ mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples
%doc org.eclipse.gef.examples-feature/epl-v10.html
%changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 3.9.100-1.gitb63ec56.1
+- SCL-ise
+
* Mon Jun 30 2014 Mat Booth <mat.booth at redhat.com> - 3.9.100-1.gitb63ec56
- Update to latest upstream release
- Add a script to make smaller source tarballs
More information about the scm-commits
mailing list