mbooth pushed to eclipse-mdt-uml2 (f21). "Update to latest upstream release"

[notifications at fedoraproject.org]

>From 7e4f05ef934ca7b9dc9273bb689d3ac06b6927ed Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Tue, 7 Apr 2015 21:41:11 +0100
Subject: Update to latest upstream release


diff --git a/.gitignore b/.gitignore
index 31352fb..271cb6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
-mdt-uml2-3.0.1.tar.gz
 /mdt-uml2-3.1.0.tar.gz
 /mdt-uml2-4.0.0.tar.gz
 /.project
 /org.eclipse.uml2-Juno_SR2.tar.bz2
+/org.eclipse.uml2-Luna_SR1.tar.bz2
+/org.eclipse.uml2-Luna_SR2.tar.bz2
+/noarch
+/*.src.rpm
diff --git a/change-build-order.patch b/change-build-order.patch
new file mode 100644
index 0000000..c0f9278
--- /dev/null
+++ b/change-build-order.patch
@@ -0,0 +1,16 @@
+--- plugins/org.eclipse.uml2-feature/feature.xml.orig	2015-04-07 21:29:06.548079086 +0100
++++ plugins/org.eclipse.uml2-feature/feature.xml	2015-04-07 21:29:32.479722774 +0100
+@@ -30,11 +30,11 @@
+    </url>
+ 
+    <includes
+-         id="org.eclipse.uml2.codegen.ecore.ui"
++         id="org.eclipse.uml2.common"
+          version="0.0.0"/>
+ 
+    <includes
+-         id="org.eclipse.uml2.common"
++         id="org.eclipse.uml2.codegen.ecore.ui"
+          version="0.0.0"/>
+ 
+    <includes
diff --git a/eclipse-mdt-uml2.spec b/eclipse-mdt-uml2.spec
index 6fd36cd..a79f118 100644
--- a/eclipse-mdt-uml2.spec
+++ b/eclipse-mdt-uml2.spec
@@ -1,17 +1,17 @@
-%global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global gittag Juno_SR2
+%global gittag Luna_SR2
 
 Name:      eclipse-mdt-uml2
-Version:   4.0.2
-Release:   4%{?dist}
+Version:   5.0.2
+Release:   1%{?dist}
 Summary:   Implementation of the UML2 OMG meta-model for Eclipse
-Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/modeling/mdt/uml2
 
 Source0:   http://git.eclipse.org/c/uml2/org.eclipse.uml2.git/snapshot/org.eclipse.uml2-%{gittag}.tar.bz2
 
+Patch0:    change-build-order.patch
+
 BuildArch:        noarch
 
 BuildRequires:    java-devel
@@ -19,7 +19,6 @@ BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    eclipse-emf >= 2.8.0
 BuildRequires:    eclipse-emf-validation >= 1.6.0-3
-Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:4.2.0
 Requires:         eclipse-emf >= 2.8.0
 Requires:         eclipse-emf-validation >= 1.6.0-3
@@ -35,6 +34,8 @@ validation rules as a means of defining and enforcing levels of compliance.
 %prep
 %setup -q -n org.eclipse.uml2-%{gittag}
 
+%patch0
+
 # remove stuff we're not building
 rm -rf deprecated/ examples/ tests/
 
@@ -62,6 +63,9 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-uml2 build/rpmBuild/org.eclipse
 %doc plugins/org.eclipse.uml2.license-feature/rootfiles/*
 
 %changelog
+* Tue Apr 07 2015 Mat Booth <mat.booth at redhat.com> - 5.0.2-1
+- Update to latest upstream release
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -98,5 +102,5 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-uml2 build/rpmBuild/org.eclipse
 * Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 3.0.1-2
 - Don't pretty-print the package description.
 
-* Tue Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 3.0.1-1
+* Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 3.0.1-1
 - New UML2 spec file based on eclipse-gef.
diff --git a/sources b/sources
index f4e160b..95427c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-546b883edf2f39e568d4c8cfab4f9d11  org.eclipse.uml2-Juno_SR2.tar.bz2
+5e7b6d08818b7f46ad1b6545a0288c1e  org.eclipse.uml2-Luna_SR2.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-mdt-uml2.git/commit/?h=f21&id=7e4f05ef934ca7b9dc9273bb689d3ac06b6927ed