akurtakov pushed to eclipse-emf-query (master). "Update to 1.8 release (..more)"

Thu Jun 4 16:56:36 UTC 2015

From a48583f2b95f4e503f2a67889fac70425938b768 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu, 4 Jun 2015 19:56:23 +0300
Subject: Update to 1.8 release

- Migrate to xmvn.

diff --git a/.gitignore b/.gitignore
index e6d3139..67d150f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.project
 /emf-query-1.6.0.tar.gz
 /org.eclipse.emf.query-Root_R1_6_maintenance.tar.gz
+/R1_8.tar.xz
diff --git a/eclipse-emf-query.spec b/eclipse-emf-query.spec
index 21a5998..5f50c0c 100644
--- a/eclipse-emf-query.spec
+++ b/eclipse-emf-query.spec
@@ -1,19 +1,14 @@
-%global eclipse_base     %{_libdir}/eclipse
-%global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global gittag Root_R1_6_maintenance
+%global gittag R1_8
 
 Name:      eclipse-emf-query
-Version:   1.6.0
-Release:   6%{?dist}
+Version:   1.8.0
+Release:   1%{?dist}
 Summary:   Specify and execute queries against EMF models
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/modeling/emf/?project=query
 
-Source0:   http://git.eclipse.org/c/emf-query/org.eclipse.emf.query.git/snapshot/org.eclipse.emf.query-%{gittag}.tar.gz
-
-# patch to accomodate ICU4J changing version number schemes
-Patch0:    fix-icu-version.patch
+Source0:   http://git.eclipse.org/c/emf-query/org.eclipse.emf.query.git/snapshot/%{gittag}.tar.xz
 
 BuildArch:        noarch
 
@@ -23,11 +18,10 @@ 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 query component facilitates the process of search and retrieval of model
@@ -36,29 +30,32 @@ Provides API support for the basic EObject based Condition objects that are
 used to formulate queries for EMF models.
 
 %prep
-%setup -q -n org.eclipse.emf.query-%{gittag}
-%patch0 -p0 -b .orig
+%setup -q -n %{gittag}
+%pom_remove_plugin org.eclipse.tycho:target-platform-configuration org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.examples.statements org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.examples.ocl org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.tests org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.ocl.tests org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.tests-feature org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.examples-feature org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.examples.source-feature org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.master-feature org.eclipse.emf.query.releng/pom.xml
+%pom_disable_module ../org.eclipse.emf.query.repository org.eclipse.emf.query.releng/pom.xml
 
 %build
-# build emf-query features
-eclipse-pdebuild -f org.eclipse.emf.query \
-  -d "emf mdt-ocl mdt-uml2"
-eclipse-pdebuild -f org.eclipse.emf.query.ocl \
-  -d "emf mdt-ocl mdt-uml2"
-eclipse-pdebuild -f org.eclipse.emf.query.doc \
-  -d "emf mdt-ocl mdt-uml2"
+%mvn_build -j -- -f org.eclipse.emf.query.releng/pom.xml
 
 %install
-install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.zip
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.ocl.zip
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.doc.zip
+%mvn_install
 
-%files
-%{eclipse_dropin}/emf-query
-%doc org.eclipse.emf.query-feature/rootfiles/*
+%files -f .mfiles
+%license org.eclipse.emf.query-feature/epl-v10.html
 
 %changelog
+* Thu Jun 4 2015 Alexander Kurtakov <akurtako at redhat.com> 1.8.0-1
+- Update to 1.8 release
+- Migrate to xmvn.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/fix-icu-version.patch b/fix-icu-version.patch
deleted file mode 100644
index edf668b..0000000
--- a/fix-icu-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- org.eclipse.emf.query/META-INF/MANIFEST.MF.orig	2013-04-21 17:32:47.767043729 +0100
-+++ org.eclipse.emf.query/META-INF/MANIFEST.MF	2013-04-21 17:33:03.999004077 +0100
-@@ -19,7 +19,7 @@
-  org.eclipse.emf.query.internal.statements;x-friends:="org.eclipse.emf.query.tests",
-  org.eclipse.emf.query.internal.util;x-friends:="org.eclipse.emf.query.tests",
-  org.eclipse.emf.query.statements
--Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)"
-+Import-Package: com.ibm.icu.text
- Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
-  org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)"
- Eclipse-LazyStart: true
diff --git a/sources b/sources
index f5eb493..7fab58f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf22128cc9648bcb0b9b63ca67cf6aa7  org.eclipse.emf.query-Root_R1_6_maintenance.tar.gz
+5672c4838736b3c2329285a35b4f683a  R1_8.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-emf-query.git/commit/?h=master&id=a48583f2b95f4e503f2a67889fac70425938b768
