[eclipse-gef] Update to 3.9.0 snapshot (aka Kepler).

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Apr 3 08:18:33 UTC 2013


commit 6eb0139b43e0f36ccd79d8ec51fd49b136240012
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Apr 3 11:18:25 2013 +0300

    Update to 3.9.0 snapshot (aka Kepler).
    
    - SCL-ize.

 .gitignore                           |    1 +
 eclipse-gef-remove-juno-target.patch |   30 ------------------------
 eclipse-gef.spec                     |   42 +++++++++++++++------------------
 get-gef.sh                           |   26 ---------------------
 sources                              |    2 +-
 5 files changed, 21 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a495cb..965a633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gef-3.7.0.tar.gz
 gef-3.8.0.tar.gz
 /gef-3.8.1.tar.gz
 /gef-3.8.1
+/org.eclipse.gef-dbf4cefdfa3affc361bc6c62174780d226e0481b.tar.bz2
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index 2c0bf39..fd31926 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -1,24 +1,18 @@
+%{?scl:%scl_package eclipse-gef}
+%{!?scl:%global pkg_name %{name}}
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
+%global git_version dbf4cefdfa3affc361bc6c62174780d226e0481b
 
-Name:      eclipse-gef
-Version:   3.8.1
+Name:       %{?scl_prefix}eclipse-gef
+Version:   3.9.0
 #no tag in the repository, HEAD checked out
-Release:   7%{?dist}
+Release:   0.1.gitdbf4cef%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/gef/
 
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-gef.sh
-Source0:   gef-%{version}.tar.gz
-Source1:   get-gef.sh
-# gef it built with maven, we are pdebuild like, so we must connect building documentation
-# with building plugins.
-
-#remove juno target (fedora will be used as target)
-Patch0:   %{name}-remove-juno-target.patch
+Source0:   http://git.eclipse.org/c/gef/org.eclipse.gef.git/snapshot/org.eclipse.gef-%{git_version}.tar.bz2
 
 BuildArch:        noarch
 
@@ -26,11 +20,11 @@ BuildRequires:    java-devel >= 1.7.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
 BuildRequires:    tycho
-BuildRequires:    eclipse-pde >= 1:4.2.1
+BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.2.1
 BuildRequires:    ant-contrib
-Requires:         java >= 1.7.0
+Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:4.2.0-0.6
+Requires:         %{?scl_prefix}eclipse-platform >= 1:4.2.1
 
 
 %description
@@ -44,7 +38,7 @@ class diagram editors, state machines, and even WYSIWYG text editors.
 Summary:   Eclipse GEF SDK
 Group:     System Environment/Libraries
 Requires:  java-javadoc
-Requires:  eclipse-pde >= 1:4.2.0-0.6
+Requires:  %{?scl_prefix}eclipse-pde >= 1:4.2.0-0.6
 Requires:  %{name} = %{version}-%{release}
 
 %description sdk
@@ -60,12 +54,9 @@ Installable versions of the example projects from the SDK that demonstrates how
 to use the Eclipse Graphical Editing Framework (GEF) plugin.
 
 %prep
-%setup -q -n gef-%{version}
-sed -i -e "s|5\.0\.0|51\.0\.0|g" org.eclipse.draw2d/META-INF/MANIFEST.MF org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF \
- org.eclipse.gef/META-INF/MANIFEST.MF org.eclipse.zest.core/META-INF/MANIFEST.MF
-
-%patch0
+%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
@@ -79,7 +70,8 @@ if [ ! -z "$JARS" ]; then
 fi
 
 %build
-mvn-rpmbuild clean install -f org.eclipse.gef.releng/pom.xml -Dmaven.local.mode=true -Dmaven.test.skip=true -DskipTychoVersionCheck
+%{?scl:%scl_maven_opts}
+mvn-rpmbuild clean install -f org.eclipse.gef.releng/pom.xml -Dmaven.test.skip=true -DskipTychoVersionCheck -P !KEPLER_4_3.target
 
 pushd org.eclipse.gef.repository/target/repository/features/
 for f in `ls`; do \
@@ -143,6 +135,10 @@ mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples
 %doc org.eclipse.gef.examples-feature/epl-v10.html
 
 %changelog
+* Wed Apr 3 2013 Alexander Kurtakov <akurtako at redhat.com> 3.9.0-0.1.gitdbf4cef
+- Update to 3.9.0 snapshot (aka Kepler).
+- SCL-ize.
+
 * Thu Feb 21 2013 Alexander Kurtakov <akurtako at redhat.com> 3.8.1-7
 - Adapt to the icu4j version jump.
 - Skip tests for now.
diff --git a/sources b/sources
index 648d260..8c39293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4af174763b9babdc1148447092ba331c  gef-3.8.1.tar.gz
+6eb93edb0cf4ad5371bd91031144b055  org.eclipse.gef-dbf4cefdfa3affc361bc6c62174780d226e0481b.tar.bz2


More information about the scm-commits mailing list