[tycho] Do not check %{_libdir}/eclipse plugins/features folders twice.
Roland Grunberg
rgrunber at fedoraproject.org
Thu Mar 6 17:15:57 UTC 2014
commit 48f7a01dca64b97329cd76b08297ebbb3b6e8eea
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Thu Mar 6 12:13:42 2014 -0500
Do not check %{_libdir}/eclipse plugins/features folders twice.
copy-platform-all | 8 --------
tycho.spec | 7 +++++--
2 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 600d815..33025fe 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -79,14 +79,6 @@ for f in $(ls -d $eclipse/dropins/sdk/features/*); do
feature=$(basename $f)
[ ! -e features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature features/$feature
done
-for p in $(ls -d $eclipse/plugins/*); do
- plugin=$(basename $p)
- [ ! -e plugins/$plugin ] && ln -s $eclipse/plugins/$plugin plugins/$plugin
-done
-for f in $(ls -d $eclipse/features/*); do
- feature=$(basename $f)
- [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature
-done
# jars in %%{_javadir} may not be uniquely named
id=1
diff --git a/tycho.spec b/tycho.spec
index d1c4498..0cbde33 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,7 +6,7 @@
# This basically uses javac + xmvn to build only the Tycho components
# required to perform a full Tycho build
# Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 0
+%global tycho_bootstrap 1
# Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
# This basically provides a location for usage of pre-bundled Eclipse
# Possible uses : Need to build Tycho before Eclipse in fresh buildroot
@@ -19,7 +19,7 @@
Name: tycho
Version: 0.19.0
-Release: 9%{?dist}
+Release: 9.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -334,6 +334,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Thu Mar 06 2014 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-9.1
+- Do not check %%{_libdir}/eclipse plugins/features folders twice.
+
* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.19.0-9
- Improve logging and error handling fop copy-platform-all
More information about the scm-commits
mailing list