[eclipse-pdt: 3/6] Copy shared license feature, allowing building on F20

Mat Booth mbooth at fedoraproject.org
Thu Jun 26 09:16:26 UTC 2014


commit dd02d855d56c5ae86724dcb86de3fd10f826a55f
Author: Mat Booth <mat.booth at redhat.com>
Date:   Mon Jun 16 18:07:55 2014 +0100

    Copy shared license feature, allowing building on F20

 eclipse-pdt.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-pdt.spec b/eclipse-pdt.spec
index b47fdd4..7af1e1f 100644
--- a/eclipse-pdt.spec
+++ b/eclipse-pdt.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-pdt
 Version:   3.3.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   PHP Development Tools (PDT) Eclipse plugin
 License:   EPL
 URL:       http://www.eclipse.org/pdt/
@@ -93,6 +93,15 @@ 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
@@ -138,6 +147,9 @@ ln -s $(build-classpath java_cup) %{buildroot}/%{eclipse_dropin}/pdt/eclipse/plu
 %doc features/org.eclipse.php-feature/*.html
 
 %changelog
+* Mon Jun 16 2014 Mat Booth <mat.booth at redhat.com> - 3.3.0-2
+- Copy shared license feature, allowing building on F20
+
 * Fri Jun 13 2014 Mat Booth <mat.booth at redhat.com> - 3.3.0-1
 - Update to latest release
 - Use pre-generated parser code


More information about the scm-commits mailing list