[eclipse-pdt: 4/6] No longer need to copy license feature on F20

[Mat Booth]

commit 9b187ba55eced16beec6cd80ca11f031da9a710c
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Jun 24 12:52:13 2014 +0100

    No longer need to copy license feature on F20

 eclipse-pdt.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/eclipse-pdt.spec b/eclipse-pdt.spec
index 7af1e1f..7a6a40d 100644
--- a/eclipse-pdt.spec
+++ b/eclipse-pdt.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-pdt
 Version:   3.3.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   PHP Development Tools (PDT) Eclipse plugin
 License:   EPL
 URL:       http://www.eclipse.org/pdt/
@@ -31,7 +31,6 @@ BuildRequires:    eclipse-wtp-common
 BuildRequires:    eclipse-wtp-sourceediting
 BuildRequires:    eclipse-license
 BuildRequires:    tycho
-BuildRequires:    jacoco-maven-plugin
 BuildRequires:    java_cup >= 0.11a-15
 BuildRequires:    xorg-x11-server-Xvfb
 
@@ -80,9 +79,10 @@ tar xf %{SOURCE1}
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
-# Remove plugins not in Fedora
+# Remove plugins not needed
 %pom_remove_plugin org.jboss.tools.tycho-plugins:repository-utils dev/org.eclipse.php-repository
 %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin org.eclipse.pdt.releng
+%pom_remove_plugin org.jacoco:jacoco-maven-plugin org.eclipse.pdt.releng
 
 # Skip code generation
 %pom_remove_plugin :maven-antrun-plugin plugins/org.eclipse.php.core
@@ -93,15 +93,6 @@ sed -i -e 's@;resolution:=optional@@g' plugins/org.eclipse.php.mylyn.ui/META-INF
 # Add java_cup as an OSGi dep instead of bundling
 echo "Require-Bundle: java_cup" >> plugins/org.eclipse.php.core.parser/META-INF/MANIFEST.MF
 
-# Needed for building on F20 only because tycho doesn't yet know about the shared license feature
-%if 0%{?fedora} == 20
-%pom_remove_plugin org.jacoco:jacoco-maven-plugin org.eclipse.pdt.releng
-pushd org.eclipse.pdt.releng
-mkdir -p .m2/p2/repo-sdk/features/
-cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
-popd
-%endif
-
 %build
 pushd org.eclipse.pdt.releng
 xvfb-run xmvn -o clean verify
@@ -147,6 +138,9 @@ ln -s $(build-classpath java_cup) %{buildroot}/%{eclipse_dropin}/pdt/eclipse/plu
 %doc features/org.eclipse.php-feature/*.html
 
 %changelog
+* Tue Jun 24 2014 Mat Booth <mat.booth at redhat.com> - 3.3.0-3
+- No longer need to copy license feature on F20
+
 * Mon Jun 16 2014 Mat Booth <mat.booth at redhat.com> - 3.3.0-2
 - Copy shared license feature, allowing building on F20
 
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29