commit debb161fee1453f4a444fa23f9f9e73f79844994 Author: Alexander Kurtakov akurtako@redhat.com Date: Fri Jul 5 17:14:12 2013 +0300
Use _jnidir too when building local p2 repo.
copy-platform-all | 10 ++++++++++ tycho.spec | 5 ++++- 2 files changed, 14 insertions(+), 1 deletions(-) --- diff --git a/copy-platform-all b/copy-platform-all index 4c556dc..6ba3f2a 100755 --- a/copy-platform-all +++ b/copy-platform-all @@ -9,6 +9,7 @@ eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse
datadir=$prefix/usr/share/eclipse javadir=$prefix/usr/share/java +jnidir=$prefix/usr/lib/java tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip
mkdir -p $sdk/plugins $sdk/features @@ -91,6 +92,15 @@ for p in $(find $javadir -name "*.jar"); do id=$((${id} + 1)) fi done +id=1 +for p in $(find $jnidir -name "*.jar"); do + unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName' + if [ $? = 0 ]; then + plugin=${id}-$(basename $p) + [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin + id=$((${id} + 1)) + fi +done
popd
diff --git a/tycho.spec b/tycho.spec index e0e4ce9..ec12e78 100644 --- a/tycho.spec +++ b/tycho.spec @@ -9,7 +9,7 @@
Name: tycho Version: 0.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries @@ -284,6 +284,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name}
%changelog +* Fri Jul 5 2013 Alexander Kurtakov akurtako@redhat.com 0.18.0-3 +- Use _jnidir too when building local p2 repo. + * Thu Jun 6 2013 Mikolaj Izdebski mizdebsk@redhat.com - 0.18.0-2 - Add Requires on plugins present in Maven super POM - Resolves: rhbz#971301
java-sig-commits@lists.fedoraproject.org