akurtakov pushed to eclipse-emf-validation (master). "Update to upstream 1.8. (..more)"

Thu Jun 4 16:18:34 UTC 2015

From 0de02a7991ef4c37fad897021e3a756cb6612403 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu, 4 Jun 2015 19:18:25 +0300
Subject: Update to upstream 1.8.

- Update to xmvn build.

diff --git a/.gitignore b/.gitignore
index eff0532..6debf2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.project
 /emf-validation-1.6.0.tar.gz
 /org.eclipse.emf.validation-Root_R1_6_maintenance.tar.gz
+/R1_8.tar.xz
diff --git a/eclipse-emf-validation.spec b/eclipse-emf-validation.spec
index 5ea99bf..13f6435 100644
--- a/eclipse-emf-validation.spec
+++ b/eclipse-emf-validation.spec
@@ -1,33 +1,25 @@
-%global eclipse_base     %{_libdir}/eclipse
-%global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global gittag Root_R1_6_maintenance
+%global gittag R1_8
 
 Name:      eclipse-emf-validation
-Version:   1.6.0
-Release:   7%{?dist}
+Version:   1.8.0
+Release:   1%{?dist}
 Summary:   Verify the integrity of EMF models
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/modeling/emf/?project=validation
 
-Source0:   http://git.eclipse.org/c/emf-validation/org.eclipse.emf.validation.git/snapshot/org.eclipse.emf.validation-%{gittag}.tar.gz
-
-# patch to accomodate ICU4J changing version number schemes
-Patch0:    fix-icu-version.patch
+Source0:   http://git.eclipse.org/c/emf-validation/org.eclipse.emf.validation.git/snapshot/%{gittag}.tar.xz
 
 BuildArch:        noarch
 
 BuildRequires:    java-devel
-BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    eclipse-emf >= 2.8.0
 BuildRequires:    eclipse-mdt-ocl >= 4.0.0
-BuildRequires:    eclipse-mdt-uml2 >= 4.0.0
-Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:4.2.0
-Requires:         eclipse-emf >= 2.8.0
-Requires:         eclipse-mdt-ocl >= 4.0.0
-Requires:         eclipse-mdt-uml2 >= 4.0.0
+BuildRequires:    tycho
+BuildRequires:    eclipse-license
+BuildRequires:    maven-antrun-plugin
+BuildRequires:    ant-contrib
 
 %description
 The validation component provides an API for defining constraints for any EMF
@@ -41,29 +33,31 @@ to constraints that need to be enforced on these objects and provides support
 for listening to validation events.
 
 %prep
-%setup -q -n org.eclipse.emf.validation-%{gittag}
-%patch0 -p0 -b .orig
+%setup -q -n %{gittag}
+
+%pom_remove_plugin org.eclipse.tycho:target-platform-configuration org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.examples.adapter org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.examples.general org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.examples-feature org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.examples.source-feature org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.tests-feature org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.master-feature org.eclipse.emf.validation.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.validation.repository org.eclipse.emf.validation.releng/pom.xml
 
 %build
-# build emf-validation features
-eclipse-pdebuild -f org.eclipse.emf.validation \
-  -d "emf-runtime mdt-ocl mdt-uml2"
-eclipse-pdebuild -f org.eclipse.emf.validation.ocl \
-  -d "emf-runtime mdt-ocl mdt-uml2"
-eclipse-pdebuild -f org.eclipse.emf.validation.doc \
-  -d "emf-runtime mdt-ocl mdt-uml2"
+%mvn_build -j -f -- -f org.eclipse.emf.validation.releng/pom.xml
 
 %install
-install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.zip
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.ocl.zip
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.eclipse.emf.validation.doc.zip
+%mvn_install
 
-%files
-%{eclipse_dropin}/emf-validation
-%doc org.eclipse.emf.validation-feature/rootfiles/*
+%files -f .mfiles
+%license org.eclipse.emf.validation-feature/epl-v10.html
 
 %changelog
+* Thu Jun 4 2015 Alexander Kurtakov <akurtako at redhat.com> 1.8.0-1
+- Update to upstream 1.8.
+- Update to xmvn build.
+
 * Thu Dec 4 2014 Alexander Kurtakov <akurtako at redhat.com> 1.6.0-7
 - Adapt to emf-runtime dropins change.
 
diff --git a/fix-icu-version.patch b/fix-icu-version.patch
deleted file mode 100644
index 652b48e..0000000
--- a/fix-icu-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./org.eclipse.emf.validation.ui/META-INF/MANIFEST.MF.orig	2013-04-21 15:21:59.920138691 +0100
-+++ ./org.eclipse.emf.validation.ui/META-INF/MANIFEST.MF	2013-04-21 15:22:17.104103090 +0100
-@@ -11,7 +11,7 @@
-  org.eclipse.emf.validation.ui.internal.l10n;x-internal:=true,
-  org.eclipse.emf.validation.ui.internal.preferences;x-internal:=true,
-  org.eclipse.emf.validation.ui.preferences
--Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)"
-+Import-Package: com.ibm.icu.text
- Require-Bundle: org.eclipse.emf.validation;bundle-version="[1.2.0,2.0.0)",
-  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
-  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
---- ./org.eclipse.emf.validation/META-INF/MANIFEST.MF.orig	2013-04-21 15:21:20.499220307 +0100
-+++ ./org.eclipse.emf.validation/META-INF/MANIFEST.MF	2013-04-21 15:21:48.807161707 +0100
-@@ -22,9 +22,9 @@
-  org.eclipse.emf.validation.service,
-  org.eclipse.emf.validation.util,
-  org.eclipse.emf.validation.xml
--Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
-- com.ibm.icu.lang;version="[4.0.0,5.0.0)",
-- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-+Import-Package: com.ibm.icu.text,
-+ com.ibm.icu.lang,
-+ com.ibm.icu.util
- Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
-  org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)",
-  org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
diff --git a/sources b/sources
index 5fd91bf..e60a5a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77178bbe212ff9d8220cccfa7682399a  org.eclipse.emf.validation-Root_R1_6_maintenance.tar.gz
+06ec5b919f8878ebae2c1acedd3b9a2f  R1_8.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-emf-validation.git/commit/?h=master&id=0de02a7991ef4c37fad897021e3a756cb6612403
