diff --git a/eclipse.spec b/eclipse.spec index 58c19a5..6510b23 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -51,7 +51,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 11.1%{?dist} +Release: 12%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -506,6 +506,10 @@ mvn-rpmbuild clean verify -P update-branding-plugins \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` +# XMvn may places jars differently from mvn-rpmbuild +sed -i 's/glassfish-jsp-api\.jar/glassfish-jsp-api\/javax\.servlet\.jsp-api\.jar/' dependencies/./replace_platform_plugins_with_symlinks.sh +sed -i 's/felix\/org\.apache\.felix\.gogo\.runtime\.jar/felix\/felix-gogo-runtime\.jar/' dependencies/./replace_platform_plugins_with_symlinks.sh + #symlink necessary plugins (that are provided by other packages) dependencies/./replace_platform_plugins_with_symlinks.sh \ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} @@ -1004,6 +1008,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Aug 27 2013 Roland Grunberg - 1:4.3.0-12 +- Update symlinks for glassfish-jsp-api and felix-gogo-runtime jars. + * Thu Aug 22 2013 Roland Grunberg - 1:4.3.0-11.1 - Bump release.