[eclipse-xsd] Build with xmvn.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Dec 8 20:02:51 UTC 2014
commit 04ab52a376e7f29eab3711d0dcefa212fedcdbf6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Dec 8 22:02:58 2014 +0200
Build with xmvn.
eclipse-xsd.spec | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
---
diff --git a/eclipse-xsd.spec b/eclipse-xsd.spec
index ce23df1..ab33621 100644
--- a/eclipse-xsd.spec
+++ b/eclipse-xsd.spec
@@ -4,7 +4,7 @@
Name: eclipse-xsd
Version: 2.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: XML Schema Definition (XSD) Eclipse plug-in
License: EPL
URL: http://www.eclipse.org/modeling/mdt/?project=xsd
@@ -20,7 +20,6 @@ BuildArch: noarch
BuildRequires: tycho
BuildRequires: tycho-extras
-BuildRequires: feclipse-maven-plugin
BuildRequires: eclipse-pde >= 1:4.4.0
BuildRequires: eclipse-emf-sdk >= 2.10.0
BuildRequires: eclipse-license
@@ -68,46 +67,30 @@ find -name *.class -exec rm -rf {} \;
%patch0 -p1
%patch1 -p1
+%mvn_package "::jar:sources:" sdk
+%mvn_package ":org.eclipse.xsd.sdk" sdk
+%mvn_package ":org.eclipse.xsd.doc" sdk
+%mvn_package ":org.eclipse.xsd.cheatsheets" sdk
+%mvn_package ":org.eclipse.xsd.example.installer" sdk
+%mvn_package ":org.eclipse.xsd.example" examples
+%mvn_package ":*" core
+
%build
-xmvn -o clean verify
+%mvn_build -j -f
%install
-# Install main features
-xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
- -Dfeatures=org.eclipse.xsd,org.eclipse.xsd.ecore.converter,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.mapping,org.eclipse.xsd.mapping.editor \
- -DsourceRepo=releng/org.eclipse.xsd.repository/target/repository \
- -DtargetLocation=%{buildroot}%{eclipse_dropin}/xsd/eclipse
-
-# Install sdk features
-xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
- -Dfeatures=org.eclipse.xsd.sdk,org.eclipse.xsd.sdk.source \
- -DsourceRepo=releng/org.eclipse.xsd.repository/target/repository \
- -DtargetLocation=%{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse
-
-# Install example features
-xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
- -Dfeatures=org.eclipse.xsd.example \
- -DsourceRepo=releng/org.eclipse.xsd.repository/target/repository \
- -DtargetLocation=%{buildroot}%{eclipse_dropin}/xsd-examples/eclipse
+%mvn_install
-# The main features are a subset of the sdk feature, so delete duplicate features & plugins from the sdk
-(cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/features | xargs rm -rf)
-(cd %{buildroot}%{eclipse_dropin}/xsd-sdk/eclipse/plugins && ls %{buildroot}%{eclipse_dropin}/xsd/eclipse/plugins | xargs rm -rf)
+%files -f .mfiles-core
-# This plugin is already installed by one of the main features
-rm %{buildroot}%{eclipse_dropin}/xsd-examples/eclipse/plugins/org.eclipse.xsd_*
+%files sdk -f .mfiles-sdk
-%files
-%{eclipse_dropin}/xsd
-%doc doc/org.eclipse.xsd.doc/about.html
-
-%files sdk
-%{eclipse_dropin}/xsd-sdk
-
-%files examples
-%{eclipse_dropin}/xsd-examples
+%files examples -f .mfiles-examples
%changelog
+* Mon Dec 8 2014 Alexander Kurtakov <akurtako at redhat.com> 2.10.1-2
+- Build with xmvn.
+
* Wed Oct 01 2014 Mat Booth <mat.booth at redhat.com> - 2.10.1-1
- Update to Luna SR1 release
- Drop upstreamed patch
More information about the scm-commits
mailing list