[eclipse] symlink emf bundles
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Aug 14 19:32:40 UTC 2012
commit 453b225467535aa657c42ebe5b0241002eead40a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Aug 14 21:32:18 2012 +0200
symlink emf bundles
eclipse.spec | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index bf6f091..8b88ac1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -111,17 +111,6 @@ Requires: jpackage-utils
%description equinox-osgi
Eclipse OSGi - Equinox
-%package emf-core
-Version: %{emf_version}
-Summary: Eclipse Modeling Framework Core
-Group: Development/Languages
-Requires: java >= 1:1.7.0
-Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
-Conflicts: eclipse-emf < 2.8.0-0.5
-
-%description emf-core
-Eclipse Modeling Framework Core
-
%package rcp
Version: %{eclipse_version}
@@ -373,6 +362,23 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
# Remove the junit library duplicated by pdebuild.
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_4.10.0.v4_10_0_v20120426-0900.jar
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.common_*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.ecore_*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.common_*.jar
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore_*.jar
+
+pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/features/
+popd
+
+pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/
+ ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.common_2.8.0.v20110913-1526.jar org.eclipse.emf.common_2.8.0.R2_8_0.jar
+ ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore_2.8.0.R2_8_0.jar
+ ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.change_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.change_2.8.0.R2_8_0.jar,4,false
+ ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.xmi_2.8.0.R2_8_0.jar,4,false
+popd
+
%post platform
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -412,14 +418,6 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/swt.jar
%{_libdir}/java/swt.jar
-%files -n eclipse-emf-core
-%{_libdir}/%{name}/features/org.eclipse.emf.common_*
-%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
-
%files rcp
%dir %{_libdir}/%{name}/features
%dir %{_datadir}/%{name}
@@ -663,6 +661,10 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/plugins/org.sat4j.pb_*
%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
# Put this in -platform since we're putting the p2 stuff here
%{_libdir}/%{name}/artifacts.xml
# FIXME: should we ship content.xml for the platform?
@@ -696,6 +698,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Tue Aug 14 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-8
+- Symlink emf bundles.
+
* Tue Aug 14 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-7
- Reduce the emf-core dependency strength.
More information about the scm-commits
mailing list