[tycho] Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.

Roland Grunberg rgrunber at fedoraproject.org
Mon Jul 30 18:49:29 UTC 2012


commit 7431c5844eff2bb256b13ba08046b38742b6845d
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Jul 30 14:48:52 2012 -0400

    Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
    
    When the path to the plugins/features folder for a set of bundles is
    "%%{_datadir}/eclipse/dropins/${name}" (missing the additional eclipse
    folder), the linking of its jars will fail.

 copy-platform-all |    2 +-
 tycho.spec        |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 8a44193..5cbd758 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -46,7 +46,7 @@ pushd $where
 				ls -d plugins/* features/* 2>/dev/null) |
 	      while read g; do
 	          [ ! -e $g ] && \
-		    ln -s $datadir/dropins/$g $g
+		    ln -s $datadir/dropins/$f/$g $g
 	      done
           fi
       done
diff --git a/tycho.spec b/tycho.spec
index 240d0b5..d5891f2 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
 
 %if %{bootstrap}
 %global snap -SNAPSHOT
@@ -8,7 +8,7 @@
 
 Name:           tycho
 Version:        0.15.0
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jul 30 2012 Roland Grunberg <rgrunber at redhat.com> 0.15.0-1.1
+- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
+
 * Thu Jul 26 2012 Roland Grunberg <rgrunber at redhat.com> 0.15.0-1
 - Update to 0.15.0.
 - Set BREE to at least JavaSE-1.6 for Eclipse feature bundles.


More information about the scm-commits mailing list