rpms/eclipse/FC-6 eclipse.spec,1.351,1.352
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 8 19:14:26 UTC 2007
Author: bkonrath
Update of /cvs/dist/rpms/eclipse/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5805
Modified Files:
eclipse.spec
Log Message:
- Disable com.jcraft.jsch_0.1.28.jar and
org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64.
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- eclipse.spec 8 Feb 2007 07:50:16 -0000 1.351
+++ eclipse.spec 8 Feb 2007 19:14:23 -0000 1.352
@@ -1348,7 +1348,13 @@
# exclude org.eclipse.ui.ide to work around
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547
UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//')
+%ifnarch ia64
aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION
+%else
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \
+ --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar \
+ --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_3.2.1.R32x_v20060919.jar
+%endif
%endif
%clean
@@ -1517,7 +1523,9 @@
%{_datadir}/%{name}/plugins/org.eclipse.rcp_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_*
+%ifnarch ia64
%{_libdir}/gcj/%{name}/org.eclipse.osgi_*
+%endif
%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
%{_libdir}/gcj/%{name}/com.ibm.icu_*
%{_libdir}/gcj/%{name}/org.eclipse.jface_*
@@ -1623,7 +1631,9 @@
%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
#%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
+%ifnarch ia64
%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
+%endif
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
@@ -1770,6 +1780,8 @@
- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
- Rework ppc64, s390{x} and sparc{64} hack to fix multilib problem.
- Specfile cleanups from review with Andrew Overholt.
+- Disable com.jcraft.jsch_0.1.28.jar and
+ org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64.
- Resolves: #224588, #211008, #225329, #207016, #227524.
* Tue Nov 28 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-23.fc6
More information about the fedora-cvs-commits
mailing list