mbooth pushed to eclipse (master). "Begin using mvn_install for installing dropins (..more)"

[notifications at fedoraproject.org]

>From 30a4fac51daa14bf87bf76d943208a37c5403b81 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Wed, 1 Apr 2015 10:36:20 +0100
Subject: Begin using mvn_install for installing dropins

- This allows us to make sub-packages noarch

diff --git a/eclipse.spec b/eclipse.spec
index 166a67a..fa5f834 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -37,7 +37,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.10.git201503310800%{?dist}
+Release:        0.11.git201503310800%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -168,7 +168,6 @@ BuildRequires: atinject-tck >= 1-18
 BuildRequires: tycho >= 0.22
 BuildRequires: tycho-extras >= 0.22
 BuildRequires: cbi-plugins
-BuildRequires: ecj >= 4.4.2-1
 BuildRequires: eclipse-ecf-core >= 3.9.3-1
 BuildRequires: eclipse-emf-core >= 1:2.10.2-1
 BuildRequires: eclipse-license
@@ -283,7 +282,10 @@ developing Eclipse plugins.
 
 %package        p2-discovery
 Summary:        Eclipse p2 Discovery
-Obsoletes:      %{name}-p2-discovery < 1:4.4.0
+BuildArch:      noarch
+Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
+# Obsoletes added in F22
+Obsoletes:      %{name}-p2-discovery < 1:4.5.0-0.10
 
 %description    p2-discovery
 The p2 Discovery mechanism provides a simplified and branded front-end for the
@@ -293,6 +295,8 @@ installer UIs.
 
 %package        contributor-tools
 Summary:        Tools for Eclipse Contributors
+BuildArch:      noarch
+Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
 
 %description    contributor-tools
 This package contains tools specifically for Eclipse contributors. It includes
@@ -500,13 +504,21 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundl
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/
 
+# It would be nice if upstream were refactored to make selecting features by maven groupId easier...
+%mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery
+%mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery
+%mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools
+%mvn_package ":org.eclipse.releng.tools" contributor-tools
+%mvn_package ":org.eclipse.swt.tools{,.feature}" contributor-tools
+%mvn_package "*:*" __noinstall
+
 %build
 #This is the lowest value where the build succeeds. 512m is not enough.
 export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
 export JAVA_HOME=%{java_home}
 export GTK_VERSION=3.0
 
-%mvn_build -j -f -- \
+%mvn_build -j -f -- -DforceContextQualifier=$(date +v%Y%m%d-%H00) \
 %if %{bootstrap}
    -P !api-generation,!build-docs \
 %endif
@@ -524,7 +536,7 @@ dependencies/fake_ant_dependency.sh \
 utils/move_JDT_PDE_to_dropins.sh \
   eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/ \
   `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
-  "jdt cvs equinox.p2.discovery.feature swt.tools.feature releng.tools e4.core.tools.feature sdk"
+  "jdt cvs sdk"
 
 # Symlink necessary plugins that are provided by other packages
 dependencies/replace_platform_plugins_with_symlinks.sh \
@@ -580,13 +592,13 @@ EOF
 popd #eclipse
 
 %install
+%mvn_install
 
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}/dropins
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
@@ -1007,12 +1019,9 @@ fi
 %{_libdir}/%{pkg_name}/dropins/sdk
 %{_libdir}/%{pkg_name}/dropins/cvs
 
-%files p2-discovery
-%{_libdir}/%{pkg_name}/dropins/equinox.p2.discovery.feature
+%files p2-discovery -f .mfiles-p2-discovery
 
-%files contributor-tools
-%{_libdir}/%{pkg_name}/dropins/swt.tools.feature
-%{_libdir}/%{pkg_name}/dropins/releng.tools
+%files contributor-tools -f .mfiles-contributor-tools
 
 %files tests
 %{_bindir}/%{pkg_name}-runEclipsePackageTests
@@ -1027,6 +1036,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Apr 01 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.11.git201503310800
+- Begin using mvn_install for installing dropins
+- This allows us to make sub-packages noarch
+
 * Tue Mar 31 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.10.git201503310800
 - Update for latest I-build
 - New sub-package for contributor-tools
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=master&id=30a4fac51daa14bf87bf76d943208a37c5403b81