[eclipse-gef] Update to latest upstream release
Mat Booth
mbooth at fedoraproject.org
Mon Jun 30 15:51:29 UTC 2014
commit d29ebbd75e04202c370527b8bdf1fd6075f2d8a7
Author: Mat Booth <mat.booth at redhat.com>
Date: Mon Jun 30 16:51:19 2014 +0100
Update to latest upstream release
- Add a script to make smaller source tarballs
- Add BR on eclipse-license
.gitignore | 20 ++++-------------
.project | 11 ---------
eclipse-gef.spec | 61 +++++++++++++++++++++++-------------------------------
get-gef.sh | 12 ++++++++++
sources | 2 +-
5 files changed, 44 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3321dd..a2bb0ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,6 @@
-gef-3.5.2.tar.gz
-gef-3.6.0.tar.gz
-/gef-3.6.1.tar.gz
-gef-3.6.2.tar.gz
-gef-3.7.0.tar.gz
-/gef-3.8.0
-/gef-3.8.0.tar.gz
/noarch
-gef-3.8.0.tar.gz
-/gef-3.8.1.tar.gz
-/gef-3.8.1
-/org.eclipse.gef-dbf4cefdfa3affc361bc6c62174780d226e0481b.tar.bz2
-/org.eclipse.gef-bd7178daf37b1e62733ac1ad94021ecf24f87275.tar.bz2
-/org.eclipse.gef-22becd5e194c202292ea171743622ac373de20bf.tar.bz2
-/org.eclipse.gef-b9f2e904bf9103bff8de05a0e56fd3623a88669e.tar.bz2
-/org.eclipse.gef-b9f2e904bf9103bff8de05a0e56fd3623a88669e
+/org.eclipse.gef-*.tar.bz2
+/org.eclipse.gef-*/
+/*.src.rpm
+/.build-*.log
+/.project
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index cb4bc8c..c95e5a7 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -1,30 +1,31 @@
-%{?scl:%scl_package eclipse-gef}
-%{!?scl:%global pkg_name %{name}}
%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global git_version b9f2e904bf9103bff8de05a0e56fd3623a88669e
-Name: %{?scl_prefix}eclipse-gef
-Version: 3.9.1
-#no tag in the repository, HEAD checked out
-Release: 0.4.gitb9f2e9%{?dist}
-Summary: Graphical Editing Framework (GEF) Eclipse plugin
+# There is no tag in the upstream repository, but this revision
+# is the one that the maintenance branch was created at so this
+# is sort of a "post-release snapshot"
+%global git_version b63ec56b20b75fc5af90fbb1e85911bed35997dc
+
+Name: eclipse-gef
+Version: 3.9.100
+
+Release: 1.gitb63ec56%{?dist}
+Summary: Graphical Editing Framework (GEF) Eclipse plug-in
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/gef/
Source0: http://git.eclipse.org/c/gef/org.eclipse.gef.git/snapshot/org.eclipse.gef-%{git_version}.tar.bz2
+# Use this script to generate a much smaller version of the above source tarball
+Source1: get-gef.sh
BuildArch: noarch
-BuildRequires: java-devel >= 1.7.0
-BuildRequires: java-javadoc
-BuildRequires: jpackage-utils
+BuildRequires: maven-local
BuildRequires: tycho
-BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.2.1
+BuildRequires: eclipse-pde >= 1:4.4.0
+BuildRequires: eclipse-license
BuildRequires: ant-contrib
-Requires: jpackage-utils
-Requires: %{?scl_prefix}eclipse-platform >= 1:4.2.1
-
+Requires: eclipse-platform >= 1:4.4.0
%description
The Graphical Editing Framework (GEF) allows developers to create a rich
@@ -36,8 +37,7 @@ class diagram editors, state machines, and even WYSIWYG text editors.
%package sdk
Summary: Eclipse GEF SDK
Group: System Environment/Libraries
-Requires: java-javadoc
-Requires: %{?scl_prefix}eclipse-pde >= 1:4.2.0-0.6
+Requires: eclipse-pde >= 1:4.4.0
Requires: %{name} = %{version}-%{release}
%description sdk
@@ -50,27 +50,16 @@ Requires: %{name} = %{version}-%{release}
%description examples
Installable versions of the example projects from the SDK that demonstrates how
-to use the Eclipse Graphical Editing Framework (GEF) plugin.
+to use the Eclipse Graphical Editing Framework (GEF) plug-in.
%prep
%setup -q -n org.eclipse.gef-%{git_version}
-rm -fr org.eclipse.gef.baseline
-# make sure upstream hasn't snuck in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
- if [ ! -L $j ]; then
- JARS="$JARS $j"
- fi
-done
-if [ ! -z "$JARS" ]; then
- echo "These jars should be deleted and symlinked to system jars: $JARS"
- exit 1
-fi
+find -name *.jar -exec rm -rf {} \;
+find -name *.class -exec rm -rf {} \;
%build
-%{?scl:%scl_maven_opts}
-mvn-rpmbuild clean install -f org.eclipse.gef.releng/pom.xml -Dmaven.test.skip=true -P !KEPLER_4_3.target
+xmvn -o clean verify -f org.eclipse.gef.releng/pom.xml -Dmaven.test.skip=true -P !LUNA_4_4.target
pushd org.eclipse.gef.repository/target/repository/features/
for f in `ls`; do \
@@ -122,20 +111,22 @@ mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples
%files
%{eclipse_dropin}/gef
-%doc org.eclipse.gef-feature/license.html
%doc org.eclipse.gef-feature/epl-v10.html
%files sdk
%{eclipse_dropin}/gef-sdk
-%doc org.eclipse.gef.sdk-feature/license.html
%doc org.eclipse.gef.sdk-feature/epl-v10.html
%files examples
%{eclipse_dropin}/gef-examples
-%doc org.eclipse.gef.examples-feature/license.html
%doc org.eclipse.gef.examples-feature/epl-v10.html
%changelog
+* 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
+- Add BR on eclipse-license
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.1-0.4.gitb9f2e9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/get-gef.sh b/get-gef.sh
new file mode 100644
index 0000000..cbda837
--- /dev/null
+++ b/get-gef.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+TAG=b63ec56b20b75fc5af90fbb1e85911bed35997dc
+
+rm -rf org.eclipse.gef-$TAG.tar.bz2
+wget http://git.eclipse.org/c/gef/org.eclipse.gef.git/snapshot/org.eclipse.gef-$TAG.tar.bz2
+
+# Remove the comedy jar-filled baseline directory (this reduces the size of the tarball by
+# something like two orders of magnatude)
+tar xf org.eclipse.gef-$TAG.tar.bz2
+(cd org.eclipse.gef-$TAG/ && rm -rf org.eclipse.gef.baseline)
+tar caf org.eclipse.gef-$TAG.tar.bz2 org.eclipse.gef-$TAG/
diff --git a/sources b/sources
index 7e0e148..1b44dd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5bc68d7a86b11e422fd4bdd8f6161c0 org.eclipse.gef-b9f2e904bf9103bff8de05a0e56fd3623a88669e.tar.bz2
+f4a00b28c6cdc328ff171673984882e3 org.eclipse.gef-b63ec56b20b75fc5af90fbb1e85911bed35997dc.tar.bz2
More information about the scm-commits
mailing list